From 2b1d8b6be81e79f7c8f18b5e4cd07da483f9b23c Mon Sep 17 00:00:00 2001 From: Jake Yip Date: Wed, 13 Nov 2019 11:57:33 +1100 Subject: [PATCH] Add executor_thread_pool_size Change I36324bae39e05dde57b962948f832c22599c13d2 added executor_thread_pool_size as a new param to oslo::messaging::default, but that option was not updated in many modules like this one. This means a user cannot set executor_thread_pool_size, as setting it anywhere else will throw a duplicate declaration error. This change update the oslo::messaging::default call accordingly, and adds an option to set it, similar to Change Id4a61c39ef6392a3d656952467c756be9e68de91 Change-Id: I709f3bd0076a68ce84d5c0e23afbbfcd23dc83a5 --- manifests/init.pp | 12 +++++++++--- ...d_executor_thread_pool_size-a81c6faab62d2349.yaml | 3 +++ spec/classes/neutron_init_spec.rb | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/add_executor_thread_pool_size-a81c6faab62d2349.yaml diff --git a/manifests/init.pp b/manifests/init.pp index 8e0cf8c9d..508faa41d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -106,6 +106,10 @@ # (optional) What RPC queue/exchange to use # Defaults to neutron # +# [*executor_thread_pool_size*] +# (optional) Size of executor thread pool when executor is threading or eventlet. +# Defaults to $::os_service_default. +# # [*default_transport_url*] # (optional) A URL representing the messaging driver to use and its full # configuration. Transport URLs take the form: @@ -343,6 +347,7 @@ class neutron ( $root_helper_daemon = $::os_service_default, $report_interval = $::os_service_default, $control_exchange = 'neutron', + $executor_thread_pool_size = $::os_service_default, $default_transport_url = $::os_service_default, $rpc_response_timeout = $::os_service_default, $rabbit_ha_queues = $::os_service_default, @@ -451,9 +456,10 @@ class neutron ( } oslo::messaging::default { 'neutron_config': - transport_url => $default_transport_url, - rpc_response_timeout => $rpc_response_timeout, - control_exchange => $control_exchange, + executor_thread_pool_size => $executor_thread_pool_size, + transport_url => $default_transport_url, + rpc_response_timeout => $rpc_response_timeout, + control_exchange => $control_exchange, } oslo::concurrency { 'neutron_config': lock_path => $lock_path } diff --git a/releasenotes/notes/add_executor_thread_pool_size-a81c6faab62d2349.yaml b/releasenotes/notes/add_executor_thread_pool_size-a81c6faab62d2349.yaml new file mode 100644 index 000000000..8e674b4f4 --- /dev/null +++ b/releasenotes/notes/add_executor_thread_pool_size-a81c6faab62d2349.yaml @@ -0,0 +1,3 @@ +--- +features: + - Add possibility to configure the size of executor thread pool. diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb index 3bed0635a..73d2a2073 100644 --- a/spec/classes/neutron_init_spec.rb +++ b/spec/classes/neutron_init_spec.rb @@ -105,6 +105,7 @@ describe 'neutron' do should contain_neutron_config('DEFAULT/control_exchange').with_value('neutron') should contain_neutron_config('DEFAULT/state_path').with_value('') should contain_neutron_config('oslo_concurrency/lock_path').with_value('$state_path/lock') + should contain_neutron_config('DEFAULT/executor_thread_pool_size').with_value('') should contain_neutron_config('DEFAULT/transport_url').with_value('') should contain_neutron_config('DEFAULT/rpc_response_timeout').with_value('') should contain_neutron_config('DEFAULT/vlan_transparent').with_value('')