openstack/puppet-keystone
Code Issues Proposed changes

Fix *_workers config settings.

Browse Source 
Admin_ and public_workers were in the wrong section. They belong to the
evenlet_server section and only impact the eventlet configuration. In
addition, they are deprecated and anyone setting them will get warnings
in their logs. For now we should mark them deprecated and get them in
the right section, but once eventlet is removed, they will also be
removed.

Change-Id: Ide4b80f0b7794ecd81599c28f65326488c8d6ed6
This commit is contained in:
Matt Fischer 2015-09-10 21:41:54 -06:00
parent 59a76f7317
commit ec84ac9c95
2 changed files with 14 additions and 10 deletions
manifests
init.pp
spec/classes
keystone_spec.rb

16
manifests/init.pp

@ -355,11 +355,15 @@
# Defaults to undef
#
# [*admin_workers*]
# (optional) The number of worker processes to serve the admin WSGI application.
# (optional) The number of worker processes to serve the admin eventlet application.
# This option is deprecated along with eventlet and will be removed in M.
# This setting has no affect when using WSGI.
# Defaults to max($::processorcount, 2)
#
# [*public_workers*]
# (optional) The number of worker processes to serve the public WSGI application.
# (optional) The number of worker processes to serve the public eventlet application.
# This option is deprecated along with eventlet and will be removed in M.
# This setting has no affect when using WSGI.
# Defaults to max($::processorcount, 2)
#
# [*sync_db*]
@ -491,14 +495,14 @@ class keystone(
$service_provider = $::keystone::params::service_provider,
$service_name = $::keystone::params::service_name,
$max_token_size = undef,
$admin_workers = max($::processorcount, 2),
$public_workers = max($::processorcount, 2),
$sync_db = true,
$enable_fernet_setup = false,
$fernet_key_repository = '/etc/keystone/fernet-keys',
$fernet_max_active_keys = undef,
$default_domain = undef,
# DEPRECATED PARAMETERS
$admin_workers = max($::processorcount, 2),
$public_workers = max($::processorcount, 2),
$mysql_module = undef,
$compute_port = undef,
) inherits keystone::params {
@ -823,8 +827,8 @@ class keystone(
}
keystone_config {
'DEFAULT/admin_workers': value => $admin_workers;
'DEFAULT/public_workers': value => $public_workers;
'eventlet_server/admin_workers': value => $admin_workers;
'eventlet_server/public_workers': value => $public_workers;
}
if $manage_service {

8
spec/classes/keystone_spec.rb

@ -212,14 +212,14 @@ describe 'keystone' do
it 'should ensure proper setting of admin_workers and public_workers' do
if param_hash['admin_workers']
is_expected.to contain_keystone_config('DEFAULT/admin_workers').with_value(param_hash['admin_workers'])
is_expected.to contain_keystone_config('eventlet_server/admin_workers').with_value(param_hash['admin_workers'])
else
is_expected.to contain_keystone_config('DEFAULT/admin_workers').with_value('2')
is_expected.to contain_keystone_config('eventlet_server/admin_workers').with_value('2')
end
if param_hash['public_workers']
is_expected.to contain_keystone_config('DEFAULT/public_workers').with_value(param_hash['public_workers'])
is_expected.to contain_keystone_config('eventlet_server/public_workers').with_value(param_hash['public_workers'])
else
is_expected.to contain_keystone_config('DEFAULT/public_workers').with_value('2')
is_expected.to contain_keystone_config('eventlet_server/public_workers').with_value('2')
end
end