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
This commit is contained in:
parent
019975d9b7
commit
2b1d8b6be8
|
@ -106,6 +106,10 @@
|
||||||
# (optional) What RPC queue/exchange to use
|
# (optional) What RPC queue/exchange to use
|
||||||
# Defaults to neutron
|
# 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*]
|
# [*default_transport_url*]
|
||||||
# (optional) A URL representing the messaging driver to use and its full
|
# (optional) A URL representing the messaging driver to use and its full
|
||||||
# configuration. Transport URLs take the form:
|
# configuration. Transport URLs take the form:
|
||||||
|
@ -343,6 +347,7 @@ class neutron (
|
||||||
$root_helper_daemon = $::os_service_default,
|
$root_helper_daemon = $::os_service_default,
|
||||||
$report_interval = $::os_service_default,
|
$report_interval = $::os_service_default,
|
||||||
$control_exchange = 'neutron',
|
$control_exchange = 'neutron',
|
||||||
|
$executor_thread_pool_size = $::os_service_default,
|
||||||
$default_transport_url = $::os_service_default,
|
$default_transport_url = $::os_service_default,
|
||||||
$rpc_response_timeout = $::os_service_default,
|
$rpc_response_timeout = $::os_service_default,
|
||||||
$rabbit_ha_queues = $::os_service_default,
|
$rabbit_ha_queues = $::os_service_default,
|
||||||
|
@ -451,9 +456,10 @@ class neutron (
|
||||||
}
|
}
|
||||||
|
|
||||||
oslo::messaging::default { 'neutron_config':
|
oslo::messaging::default { 'neutron_config':
|
||||||
transport_url => $default_transport_url,
|
executor_thread_pool_size => $executor_thread_pool_size,
|
||||||
rpc_response_timeout => $rpc_response_timeout,
|
transport_url => $default_transport_url,
|
||||||
control_exchange => $control_exchange,
|
rpc_response_timeout => $rpc_response_timeout,
|
||||||
|
control_exchange => $control_exchange,
|
||||||
}
|
}
|
||||||
|
|
||||||
oslo::concurrency { 'neutron_config': lock_path => $lock_path }
|
oslo::concurrency { 'neutron_config': lock_path => $lock_path }
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- Add possibility to configure the size of executor thread pool.
|
|
@ -105,6 +105,7 @@ describe 'neutron' do
|
||||||
should contain_neutron_config('DEFAULT/control_exchange').with_value('neutron')
|
should contain_neutron_config('DEFAULT/control_exchange').with_value('neutron')
|
||||||
should contain_neutron_config('DEFAULT/state_path').with_value('<SERVICE DEFAULT>')
|
should contain_neutron_config('DEFAULT/state_path').with_value('<SERVICE DEFAULT>')
|
||||||
should contain_neutron_config('oslo_concurrency/lock_path').with_value('$state_path/lock')
|
should contain_neutron_config('oslo_concurrency/lock_path').with_value('$state_path/lock')
|
||||||
|
should contain_neutron_config('DEFAULT/executor_thread_pool_size').with_value('<SERVICE DEFAULT>')
|
||||||
should contain_neutron_config('DEFAULT/transport_url').with_value('<SERVICE DEFAULT>')
|
should contain_neutron_config('DEFAULT/transport_url').with_value('<SERVICE DEFAULT>')
|
||||||
should contain_neutron_config('DEFAULT/rpc_response_timeout').with_value('<SERVICE DEFAULT>')
|
should contain_neutron_config('DEFAULT/rpc_response_timeout').with_value('<SERVICE DEFAULT>')
|
||||||
should contain_neutron_config('DEFAULT/vlan_transparent').with_value('<SERVICE DEFAULT>')
|
should contain_neutron_config('DEFAULT/vlan_transparent').with_value('<SERVICE DEFAULT>')
|
||||||
|
|
Loading…
Reference in New Issue