From 22652dc0a7a0b8e94ff8006851834ed7c8e285ac Mon Sep 17 00:00:00 2001
From: Maksym Yatsenko <myatsenko@mirantis.com>
Date: Mon, 3 Oct 2016 13:25:55 +0300
Subject: [PATCH] Change number of threads of keystone to 1

The number of keystone threads in apache
was changed to 1 to solve keystone performance
degradation issue.

Change-Id: Iba8f2c7a6f7da10caae2c451ea420f88d6c28a46
Closes-Bug: #1628534
---
 .../openstack_tasks/manifests/keystone/keystone.pp   |  2 +-
 tests/noop/spec/hosts/keystone/keystone_spec.rb      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp b/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
index a599e7e05d..302d7cc39c 100644
--- a/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
+++ b/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
@@ -151,7 +151,7 @@ class openstack_tasks::keystone::keystone {
 
   class { '::keystone::wsgi::apache':
     priority              => '05',
-    threads               => 3,
+    threads               => 1,
     workers               => min($::processorcount, 6),
     ssl                   => $ssl,
     vhost_custom_fragment => $vhost_limit_request_field_size,
diff --git a/tests/noop/spec/hosts/keystone/keystone_spec.rb b/tests/noop/spec/hosts/keystone/keystone_spec.rb
index 4064196456..25765b43d1 100644
--- a/tests/noop/spec/hosts/keystone/keystone_spec.rb
+++ b/tests/noop/spec/hosts/keystone/keystone_spec.rb
@@ -206,26 +206,26 @@ describe manifest do
         should contain_keystone_config('eventlet_server/admin_workers').with(:value => service_workers)
      end
 
-     it 'should declare keystone::wsgi::apache class with 4 processess and 3 threads on 4 CPU system' do
+     it 'should declare keystone::wsgi::apache class with 4 processess and 1 threads on 4 CPU system' do
        should contain_class('keystone::wsgi::apache').with(
-         'threads'               => '3',
+         'threads'               => '1',
          'workers'               => '4',
          'vhost_custom_fragment' => 'LimitRequestFieldSize 81900'
        )
      end
 
-     it 'should declare keystone::wsgi::apache class with 6 processes and 3 threads on 48 CPU system' do
+     it 'should declare keystone::wsgi::apache class with 6 processes and 1 threads on 48 CPU system' do
        facts[:processorcount] = 48
        should contain_class('keystone::wsgi::apache').with(
-         'threads' => '3',
+         'threads' => '1',
          'workers' => '6'
        )
      end
 
-     it 'should declare keystone::wsgi::apache class with 1 process and 3 threads on 1 CPU system' do
+     it 'should declare keystone::wsgi::apache class with 1 process and 1 threads on 1 CPU system' do
        facts[:processorcount] = 1
        should contain_class('keystone::wsgi::apache').with(
-         'threads' => '3',
+         'threads' => '1',
          'workers' => '1'
        )
      end