Add support for rpc_response_timeout option
Adds support for rpc_response_timeout option. Change-Id: Ic5dd494d17895a6539cf9d48374afe136b8af2c8
This commit is contained in:
parent
42dff425bc
commit
77b1a69010
|
@ -22,6 +22,10 @@
|
||||||
# (Optional) Use these options to configure the RabbitMQ message system.
|
# (Optional) Use these options to configure the RabbitMQ message system.
|
||||||
# Defaults to 'rabbit'
|
# Defaults to 'rabbit'
|
||||||
#
|
#
|
||||||
|
# [*rpc_response_timeout*]
|
||||||
|
# (optional) Seconds to wait for a response from a call
|
||||||
|
# Defaults to $::os_service_default
|
||||||
|
#
|
||||||
# [*control_exchange*]
|
# [*control_exchange*]
|
||||||
# (Optional)
|
# (Optional)
|
||||||
# Defaults to 'openstack'.
|
# Defaults to 'openstack'.
|
||||||
|
@ -315,6 +319,7 @@ class cinder (
|
||||||
$database_max_overflow = undef,
|
$database_max_overflow = undef,
|
||||||
$default_transport_url = $::os_service_default,
|
$default_transport_url = $::os_service_default,
|
||||||
$rpc_backend = 'rabbit',
|
$rpc_backend = 'rabbit',
|
||||||
|
$rpc_response_timeout = $::os_service_default,
|
||||||
$control_exchange = 'openstack',
|
$control_exchange = 'openstack',
|
||||||
$rabbit_ha_queues = $::os_service_default,
|
$rabbit_ha_queues = $::os_service_default,
|
||||||
$rabbit_heartbeat_timeout_threshold = $::os_service_default,
|
$rabbit_heartbeat_timeout_threshold = $::os_service_default,
|
||||||
|
@ -462,8 +467,9 @@ deprecated. Please use cinder::default_transport_url instead.")
|
||||||
}
|
}
|
||||||
|
|
||||||
oslo::messaging::default { 'cinder_config':
|
oslo::messaging::default { 'cinder_config':
|
||||||
transport_url => $default_transport_url,
|
transport_url => $default_transport_url,
|
||||||
control_exchange => $control_exchange,
|
rpc_response_timeout => $rpc_response_timeout,
|
||||||
|
control_exchange => $control_exchange,
|
||||||
}
|
}
|
||||||
|
|
||||||
if ! $default_availability_zone {
|
if ! $default_availability_zone {
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- Adds support for rpc_response_timeout option.
|
|
@ -34,6 +34,7 @@ describe 'cinder' do
|
||||||
it 'should contain default config' do
|
it 'should contain default config' do
|
||||||
is_expected.to contain_cinder_config('DEFAULT/transport_url').with(:value => '<SERVICE DEFAULT>')
|
is_expected.to contain_cinder_config('DEFAULT/transport_url').with(:value => '<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_cinder_config('DEFAULT/rpc_backend').with(:value => 'rabbit')
|
is_expected.to contain_cinder_config('DEFAULT/rpc_backend').with(:value => 'rabbit')
|
||||||
|
is_expected.to contain_cinder_config('DEFAULT/rpc_response_timeout').with(:value => '<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_cinder_config('DEFAULT/control_exchange').with(:value => 'openstack')
|
is_expected.to contain_cinder_config('DEFAULT/control_exchange').with(:value => 'openstack')
|
||||||
is_expected.to contain_cinder_config('DEFAULT/report_interval').with(:value => '<SERVICE DEFAULT>')
|
is_expected.to contain_cinder_config('DEFAULT/report_interval').with(:value => '<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_cinder_config('DEFAULT/service_down_time').with(:value => '<SERVICE DEFAULT>')
|
is_expected.to contain_cinder_config('DEFAULT/service_down_time').with(:value => '<SERVICE DEFAULT>')
|
||||||
|
|
Loading…
Reference in New Issue