openstack
/
puppet-keystone
Code Issues Proposed changes

Expose executor_thread_pool_size 

This option has been supported by puppet-oslo but has not been
configurable.

Change-Id: Iadb2308d8a7f6c32e01395ca17861b172217f3d6
This commit is contained in:
Takashi Kajinami 2023-03-13 11:47:30 +09:00
parent 486d7f1435
commit eab0404ff3
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/init.pp
View File

@ -166,6 +166,10 @@
# (Optional) Seconds to wait for a response from a call. # (Optional) Seconds to wait for a response from a call.
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# [*executor_thread_pool_size*]
# (Optional) Size of executor thread pool when executor is threading or eventlet.
# Defaults to $facts['os_service_default'].
#
# [*public_endpoint*] # [*public_endpoint*]
# (Optional) The base public endpoint URL for keystone that are # (Optional) The base public endpoint URL for keystone that are
# advertised to clients (NOTE: this does NOT affect how # advertised to clients (NOTE: this does NOT affect how
@ -366,6 +370,7 @@ class keystone(
$notification_format = $facts['os_service_default'], $notification_format = $facts['os_service_default'],
$notification_opt_out = $facts['os_service_default'], $notification_opt_out = $facts['os_service_default'],
$control_exchange = $facts['os_service_default'], $control_exchange = $facts['os_service_default'],
$executor_thread_pool_size = $facts['os_service_default'],
$rpc_response_timeout = $facts['os_service_default'], $rpc_response_timeout = $facts['os_service_default'],
$service_name = $::keystone::params::service_name, $service_name = $::keystone::params::service_name,
$max_token_size = $facts['os_service_default'], $max_token_size = $facts['os_service_default'],
@ -490,9 +495,10 @@ class keystone(
} }
oslo::messaging::default { 'keystone_config': oslo::messaging::default { 'keystone_config':
transport_url => $default_transport_url, executor_thread_pool_size => $executor_thread_pool_size,
control_exchange => $control_exchange, transport_url => $default_transport_url,
rpc_response_timeout => $rpc_response_timeout, control_exchange => $control_exchange,
rpc_response_timeout => $rpc_response_timeout,
} }
oslo::messaging::notifications { 'keystone_config': oslo::messaging::notifications { 'keystone_config':

4
releasenotes/notes/executor_thread_pool_size-9da1d6c17a448e38.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
The new ``keystone::executor_thread_pool_size`` parameter has been added.

17
spec/classes/keystone_init_spec.rb
View File

@ -54,9 +54,10 @@ describe 'keystone' do
is_expected.to contain_keystone_config('DEFAULT/notification_opt_out').with_value('<SERVICE DEFAULT>') is_expected.to contain_keystone_config('DEFAULT/notification_opt_out').with_value('<SERVICE DEFAULT>')
is_expected.to contain_oslo__messaging__default('keystone_config').with( is_expected.to contain_oslo__messaging__default('keystone_config').with(
:transport_url => '<SERVICE DEFAULT>', :executor_thread_pool_size => '<SERVICE DEFAULT>',
:control_exchange => '<SERVICE DEFAULT>', :transport_url => '<SERVICE DEFAULT>',
:rpc_response_timeout => '<SERVICE DEFAULT>', :control_exchange => '<SERVICE DEFAULT>',
:rpc_response_timeout => '<SERVICE DEFAULT>',
) )
is_expected.to contain_oslo__messaging__notifications('keystone_config').with( is_expected.to contain_oslo__messaging__notifications('keystone_config').with(
@ -270,15 +271,17 @@ describe 'keystone' do
:notification_driver => ['keystone.openstack.common.notifier.rpc_notifier'], :notification_driver => ['keystone.openstack.common.notifier.rpc_notifier'],
:notification_topics => ['notifications'], :notification_topics => ['notifications'],
:control_exchange => 'keystone', :control_exchange => 'keystone',
:rpc_response_timeout => 120 :rpc_response_timeout => 120,
:executor_thread_pool_size => 64,
} }
end end
it { it {
is_expected.to contain_oslo__messaging__default('keystone_config').with( is_expected.to contain_oslo__messaging__default('keystone_config').with(
:transport_url => 'rabbit://user:pass@host:1234/virt', :executor_thread_pool_size => 64,
:control_exchange => 'keystone', :transport_url => 'rabbit://user:pass@host:1234/virt',
:rpc_response_timeout => 120, :control_exchange => 'keystone',
:rpc_response_timeout => 120,
) )
is_expected.to contain_oslo__messaging__notifications('keystone_config').with( is_expected.to contain_oslo__messaging__notifications('keystone_config').with(