openstack/puppet-mistral
Code Issues Proposed changes

Merge "Add rpc_response_timeout option for Oslo Messaging"

Browse Source
This commit is contained in:
Jenkins
2016-09-16 22:19:47 +00:00
committed by Gerrit Code Review
parent c82e95d42a da23831e59
commit 79ed6fb58e
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/init.pp
View File

@@ -171,6 +171,10 @@
# (Optional)
# Defaults to $::os_service_default
#
# [*rpc_response_timeout*]
# (Optional) Seconds to wait for a response from a call. (integer value)
# Defaults to $::os_service_default
#
# [*coordination_backend_url*]
# (optional) The backend URL to be used for coordination.
# Defaults to $::os_service_default
@@ -200,6 +204,7 @@ class mistral(
$auth_uri = 'http://localhost:5000/',
$identity_uri = 'http://localhost:35357/',
$control_exchange = $::os_service_default,
$rpc_response_timeout = $::os_service_default,
$rabbit_host = $::os_service_default,
$rabbit_port = $::os_service_default,
$rabbit_hosts = $::os_service_default,
@@ -263,7 +268,8 @@ class mistral(
}
oslo::messaging::default {'mistral_config':
control_exchange => $control_exchange
control_exchange => $control_exchange,
rpc_response_timeout => $rpc_response_timeout,
}
if $rpc_backend in [$::os_service_default, 'rabbit'] {

1
spec/classes/mistral_init_spec.rb
View File

@@ -34,6 +34,7 @@ describe 'mistral' do
it 'should contain default config' do
is_expected.to contain_mistral_config('DEFAULT/rpc_backend').with(:value => 'rabbit')
is_expected.to contain_mistral_config('DEFAULT/control_exchange').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_mistral_config('DEFAULT/rpc_response_timeout').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_mistral_config('DEFAULT/report_interval').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_mistral_config('DEFAULT/service_down_time').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_mistral_config('oslo_messaging_rabbit/rabbit_password').with(:value => '<SERVICE DEFAULT>', :secret => true)