From 9213455105c9d231a35649d03f83e2aab06a66da Mon Sep 17 00:00:00 2001
From: Dmitry Shulyak <dshulyak@mirantis.com>
Date: Sat, 15 Nov 2014 18:29:48 +0000
Subject: [PATCH] Revert "Raise number of nailgun uWSGI workers and sockets"

This reverts commit 39dd5e2bd811bbcc472d48890f9e3c5ae499cc64.
Closes-Bug: 1393049
Change-Id: Ib52af8ba3e7cb22daf5f8dc59af4e38863e64cf7
---
 deployment/puppet/nailgun/manifests/host.pp                | 2 --
 deployment/puppet/nailgun/manifests/uwsgi.pp               | 4 ++--
 deployment/puppet/nailgun/templates/uwsgi_nailgun.yaml.erb | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/deployment/puppet/nailgun/manifests/host.pp b/deployment/puppet/nailgun/manifests/host.pp
index 7f6a7f4c26..418e348392 100644
--- a/deployment/puppet/nailgun/manifests/host.pp
+++ b/deployment/puppet/nailgun/manifests/host.pp
@@ -81,6 +81,4 @@ $gem_source = 'http://localhost/gems/',
   sysctl::value{'net.ipv4.neigh.default.gc_thresh2': value => '1024'}
   sysctl::value{'net.ipv4.neigh.default.gc_thresh3': value => '2048'}
 
-  #Increase max connections for sockets for Nailgun uWSGI
-  sysctl::value{'net.core.somaxconn': value => '4096'}
 }
diff --git a/deployment/puppet/nailgun/manifests/uwsgi.pp b/deployment/puppet/nailgun/manifests/uwsgi.pp
index 8b91aa91e4..15e3977e88 100644
--- a/deployment/puppet/nailgun/manifests/uwsgi.pp
+++ b/deployment/puppet/nailgun/manifests/uwsgi.pp
@@ -7,10 +7,10 @@
 class nailgun::uwsgi(
 ) {
 
-  if $::physicalprocessorcount > 4  {
+  if $::physicalprocessorcount > 8  {
     $physicalprocessorcount = 8
   } else {
-    $physicalprocessorcount = $::physicalprocessorcount * 2
+    $physicalprocessorcount = $::physicalprocessorcount
   }
 
   package { ['uwsgi', 'uwsgi-plugin-common', 'uwsgi-plugin-python']:
diff --git a/deployment/puppet/nailgun/templates/uwsgi_nailgun.yaml.erb b/deployment/puppet/nailgun/templates/uwsgi_nailgun.yaml.erb
index e113bdb8a6..c816235291 100644
--- a/deployment/puppet/nailgun/templates/uwsgi_nailgun.yaml.erb
+++ b/deployment/puppet/nailgun/templates/uwsgi_nailgun.yaml.erb
@@ -11,6 +11,5 @@ uwsgi:
   virtualenv: <%= @venv %>
   module: nailgun.wsgi
   buffer-size: 49180
-  listen: 4096
   pidfile: /tmp/nailgun.pid
   logto: /var/log/nailgun/app.log