Merge "Expose executor_thread_pool_size"
This commit is contained in:
commit
d9240327d4
|
@ -30,6 +30,10 @@
|
||||||
# option.
|
# option.
|
||||||
# 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'].
|
||||||
|
#
|
||||||
# [*rabbit_use_ssl*]
|
# [*rabbit_use_ssl*]
|
||||||
# (optional) Boolean. Connect over SSL for RabbitMQ. (boolean value)
|
# (optional) Boolean. Connect over SSL for RabbitMQ. (boolean value)
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
|
@ -376,6 +380,7 @@ class nova(
|
||||||
$rpc_response_timeout = $facts['os_service_default'],
|
$rpc_response_timeout = $facts['os_service_default'],
|
||||||
$long_rpc_timeout = $facts['os_service_default'],
|
$long_rpc_timeout = $facts['os_service_default'],
|
||||||
$control_exchange = $facts['os_service_default'],
|
$control_exchange = $facts['os_service_default'],
|
||||||
|
$executor_thread_pool_size = $facts['os_service_default'],
|
||||||
$rabbit_use_ssl = $facts['os_service_default'],
|
$rabbit_use_ssl = $facts['os_service_default'],
|
||||||
$rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
|
$rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
|
||||||
$rabbit_heartbeat_rate = $facts['os_service_default'],
|
$rabbit_heartbeat_rate = $facts['os_service_default'],
|
||||||
|
@ -647,9 +652,10 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
|
||||||
}
|
}
|
||||||
|
|
||||||
oslo::messaging::default { 'nova_config':
|
oslo::messaging::default { 'nova_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,
|
||||||
}
|
}
|
||||||
|
|
||||||
nova_config {
|
nova_config {
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The new ``nova::executor_thread_pool_size`` parameter has been added.
|
|
@ -31,9 +31,10 @@ describe 'nova' do
|
||||||
|
|
||||||
it 'configures rabbit' do
|
it 'configures rabbit' do
|
||||||
is_expected.to contain_oslo__messaging__default('nova_config').with(
|
is_expected.to contain_oslo__messaging__default('nova_config').with(
|
||||||
:transport_url => '<SERVICE DEFAULT>',
|
:executor_thread_pool_size => '<SERVICE DEFAULT>',
|
||||||
:rpc_response_timeout => '<SERVICE DEFAULT>',
|
:transport_url => '<SERVICE DEFAULT>',
|
||||||
:control_exchange => '<SERVICE DEFAULT>',
|
:rpc_response_timeout => '<SERVICE DEFAULT>',
|
||||||
|
:control_exchange => '<SERVICE DEFAULT>',
|
||||||
)
|
)
|
||||||
is_expected.to contain_oslo__messaging__rabbit('nova_config').with(
|
is_expected.to contain_oslo__messaging__rabbit('nova_config').with(
|
||||||
:rabbit_use_ssl => '<SERVICE DEFAULT>',
|
:rabbit_use_ssl => '<SERVICE DEFAULT>',
|
||||||
|
@ -111,6 +112,7 @@ describe 'nova' do
|
||||||
:rpc_response_timeout => '30',
|
:rpc_response_timeout => '30',
|
||||||
:long_rpc_timeout => '1800',
|
:long_rpc_timeout => '1800',
|
||||||
:control_exchange => 'nova',
|
:control_exchange => 'nova',
|
||||||
|
:executor_thread_pool_size => 64,
|
||||||
:rabbit_use_ssl => true,
|
:rabbit_use_ssl => true,
|
||||||
:rabbit_heartbeat_timeout_threshold => '60',
|
:rabbit_heartbeat_timeout_threshold => '60',
|
||||||
:rabbit_heartbeat_rate => '10',
|
:rabbit_heartbeat_rate => '10',
|
||||||
|
@ -182,9 +184,10 @@ describe 'nova' do
|
||||||
|
|
||||||
it 'configures rabbit' do
|
it 'configures rabbit' do
|
||||||
is_expected.to contain_oslo__messaging__default('nova_config').with(
|
is_expected.to contain_oslo__messaging__default('nova_config').with(
|
||||||
:transport_url => 'rabbit://rabbit_user:password@localhost:5673',
|
:executor_thread_pool_size => 64,
|
||||||
:rpc_response_timeout => '30',
|
:transport_url => 'rabbit://rabbit_user:password@localhost:5673',
|
||||||
:control_exchange => 'nova',
|
:rpc_response_timeout => '30',
|
||||||
|
:control_exchange => 'nova',
|
||||||
)
|
)
|
||||||
is_expected.to contain_oslo__messaging__rabbit('nova_config').with(
|
is_expected.to contain_oslo__messaging__rabbit('nova_config').with(
|
||||||
:rabbit_use_ssl => true,
|
:rabbit_use_ssl => true,
|
||||||
|
|
Loading…
Reference in New Issue