openstack/puppet-keystone
Code Issues Proposed changes

Merge "Fix *_workers config settings."

Browse Source
This commit is contained in:
Jenkins 2015-09-14 02:52:38 +00:00 committed by Gerrit Code Review
commit 6d8239183b
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 # Defaults to undef
# #
# [*admin_workers*] # [*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) # Defaults to max($::processorcount, 2)
# #
# [*public_workers*] # [*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) # Defaults to max($::processorcount, 2)
# #
# [*sync_db*] # [*sync_db*]
@ -491,14 +495,14 @@ class keystone(
$service_provider = $::keystone::params::service_provider, $service_provider = $::keystone::params::service_provider,
$service_name = $::keystone::params::service_name, $service_name = $::keystone::params::service_name,
$max_token_size = undef, $max_token_size = undef,
$admin_workers = max($::processorcount, 2),
$public_workers = max($::processorcount, 2),
$sync_db = true, $sync_db = true,
$enable_fernet_setup = false, $enable_fernet_setup = false,
$fernet_key_repository = '/etc/keystone/fernet-keys', $fernet_key_repository = '/etc/keystone/fernet-keys',
$fernet_max_active_keys = undef, $fernet_max_active_keys = undef,
$default_domain = undef, $default_domain = undef,
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$admin_workers = max($::processorcount, 2),
$public_workers = max($::processorcount, 2),
$mysql_module = undef, $mysql_module = undef,
$compute_port = undef, $compute_port = undef,
) inherits keystone::params { ) inherits keystone::params {
@ -823,8 +827,8 @@ class keystone(
} }
keystone_config { keystone_config {
'DEFAULT/admin_workers': value => $admin_workers; 'eventlet_server/admin_workers': value => $admin_workers;
'DEFAULT/public_workers': value => $public_workers; 'eventlet_server/public_workers': value => $public_workers;
} }
if $manage_service { 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 it 'should ensure proper setting of admin_workers and public_workers' do
if param_hash['admin_workers'] 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 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 end
if param_hash['public_workers'] 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 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
end end