openstack/puppet-manila
Code Issues Proposed changes

Merge "Add rpc_response_timeout option"

Browse Source
This commit is contained in:
Jenkins 2017-02-06 17:23:22 +00:00 committed by Gerrit Code Review
commit f799c2df05
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/init.pp
View File

@ -41,6 +41,10 @@
# transport://user:pass@host1:port[,hostN:portN]/virtual_host # transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*rpc_response_timeout*]
# (Optional) Seconds to wait for a response from a call.
# Defaults to $::os_service_default
#
# [*control_exchange*] # [*control_exchange*]
# (Optional) The default exchange under which topics are scope. # (Optional) The default exchange under which topics are scope.
# Defaults to 'openstack'. # Defaults to 'openstack'.
@ -252,6 +256,7 @@ class manila (
$database_max_overflow = undef, $database_max_overflow = undef,
$rpc_backend = 'rabbit', $rpc_backend = 'rabbit',
$default_transport_url = $::os_service_default, $default_transport_url = $::os_service_default,
$rpc_response_timeout = $::os_service_default,
$control_exchange = 'openstack', $control_exchange = 'openstack',
$notification_transport_url = $::os_service_default, $notification_transport_url = $::os_service_default,
$notification_driver = 'messaging', $notification_driver = 'messaging',
@ -385,8 +390,9 @@ deprecated. Please use manila::default_transport_url instead.")
} }
oslo::messaging::default { 'manila_config': oslo::messaging::default { 'manila_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,
} }
oslo::messaging::notifications { 'manila_config': oslo::messaging::notifications { 'manila_config':

4
releasenotes/notes/add_messaging_default_parameters-3a3498137813a8d6.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- Add new parameter "rpc_response_timeout", seconds to wait for a
response from a call

7
spec/classes/manila_init_spec.rb
View File

@ -33,6 +33,9 @@ describe 'manila' do
is_expected.to contain_manila_config('DEFAULT/transport_url').with( is_expected.to contain_manila_config('DEFAULT/transport_url').with(
:value => '<SERVICE DEFAULT>' :value => '<SERVICE DEFAULT>'
) )
is_expected.to contain_manila_config('DEFAULT/rpc_response_timeout').with(
:value => '<SERVICE DEFAULT>'
)
is_expected.to contain_manila_config('oslo_messaging_notifications/transport_url').with( is_expected.to contain_manila_config('oslo_messaging_notifications/transport_url').with(
:value => '<SERVICE DEFAULT>' :value => '<SERVICE DEFAULT>'
) )
@ -278,11 +281,15 @@ describe 'manila' do
let :params do let :params do
{ {
:default_transport_url => 'rabbit://rabbit_user:password@localhost:5673', :default_transport_url => 'rabbit://rabbit_user:password@localhost:5673',
:rpc_response_timeout => '120',
:control_exchange => 'manila',
:notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673', :notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673',
} }
end end
it { is_expected.to contain_manila_config('DEFAULT/transport_url').with_value('rabbit://rabbit_user:password@localhost:5673') } it { is_expected.to contain_manila_config('DEFAULT/transport_url').with_value('rabbit://rabbit_user:password@localhost:5673') }
it { is_expected.to contain_manila_config('DEFAULT/rpc_response_timeout').with_value('120') }
it { is_expected.to contain_manila_config('DEFAULT/control_exchange').with_value('manila') }
it { is_expected.to contain_manila_config('oslo_messaging_notifications/transport_url').with_value('rabbit://rabbit_user:password@localhost:5673') } it { is_expected.to contain_manila_config('oslo_messaging_notifications/transport_url').with_value('rabbit://rabbit_user:password@localhost:5673') }
end end