openstack
/
puppet-keystone
Code Issues Proposed changes

Merge "Fix performance regression due to reduced number of keystone workers"

This commit is contained in:
Zuul 2020-02-19 18:43:24 +00:00 committed by Gerrit Code Review
parent 12f2f9c6e3 8f5301d20d
commit 7586bc88c1
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/wsgi/apache.pp
View File

@ -32,7 +32,7 @@
#
# [*workers*]
# (Optional) Number of WSGI workers to spawn.
# Defaults to $::os_workers
# Defaults to $::os_workers_keystone
#
# [*ssl_cert*]
# (Optional) Path to SSL certificate
@ -139,7 +139,7 @@ class keystone::wsgi::apache (
$api_port = 5000,
$path = '/',
$ssl = true,
$workers = $::os_workers,
$workers = $::os_workers_keystone,
$ssl_cert = undef,
$ssl_key = undef,
$ssl_chain = undef,

5
releasenotes/notes/double-workers-b9e340a18a5e9823.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Workers are raised to 2 x os_workers, so that we have as many workers as
the one we had before we merged 2 keystone services(public and admin).

4
spec/classes/keystone_db_postgresql_spec.rb
View File

@ -31,8 +31,8 @@ describe 'keystone::db::postgresql' do
context "on #{os}" do
let (:facts) do
facts.merge(OSDefaults.get_facts({
:os_workers => 8,
:concat_basedir => '/var/lib/puppet/concat'
:os_workers_keystone => 8,
:concat_basedir => '/var/lib/puppet/concat'
}))
end

8
spec/classes/keystone_wsgi_apache_spec.rb
View File

@ -22,7 +22,7 @@ describe 'keystone::wsgi::apache' do
:bind_host => nil,
:bind_port => 5000,
:group => 'keystone',
:workers => facts[:os_workers],
:workers => facts[:os_workers_keystone],
:threads => 1,
:user => 'keystone',
:priority => '10',
@ -193,9 +193,9 @@ describe 'keystone::wsgi::apache' do
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts({
:os_workers => 8,
:concat_basedir => '/var/lib/puppet/concat',
:fqdn => 'some.host.tld',
:os_workers_keystone => 8,
:concat_basedir => '/var/lib/puppet/concat',
:fqdn => 'some.host.tld',
}))
end