openstack/puppet-ceilometer
Code Issues Proposed changes

Add control_exchange and rpc_response_timeout options

Browse Source 
Add control_exchange to configure an exchange name for message.
Add rpc_response_timeout to configure seconds time for waiting
for a response from a call.

Change-Id: I0d54accfea048fa394dac18e141a620d127579cf
This commit is contained in:
ZhongShengping 2017-01-28 12:59:08 +08:00
parent e80d90dc18
commit 895a8eaa87
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/init.pp
View File

@ -57,6 +57,16 @@
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
# 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*]
# (Optional) The default exchange under which topics are scoped. May be
# overridden by an exchange name specified in the transport_url
# option.
# Defaults to $::os_service_default
#
# [*notification_transport_url*]
# (optional) A URL representing the messaging driver to use for notifications
# and its full configuration. Transport URLs take the form:
@ -243,6 +253,8 @@ class ceilometer(
$use_stderr = undef,
$log_facility = undef,
$default_transport_url = $::os_service_default,
$rpc_response_timeout = $::os_service_default,
$control_exchange = $::os_service_default,
$notification_transport_url = $::os_service_default,
$rpc_backend = $::os_service_default,
$rabbit_ha_queues = $::os_service_default,
@ -398,7 +410,9 @@ deprecated. Please use ceilometer::default_transport_url instead.")
}
oslo::messaging::default { 'ceilometer_config':
transport_url => $default_transport_url,
transport_url => $default_transport_url,
rpc_response_timeout => $rpc_response_timeout,
control_exchange => $control_exchange,
}
oslo::cache { 'ceilometer_config':

7
releasenotes/notes/add_messaging_default_parameters-813a34e99f22d134.yaml Normal file
View File

@ -0,0 +1,7 @@
---
features:
- Add new parameter "control_exchange", the default exchange under
which topics are scoped. May be overridden by an exchange name
specified in the transport_url option.
- Add new parameter "rpc_response_timeout", seconds to wait for a
response from a call

12
spec/classes/ceilometer_init_spec.rb
View File

@ -124,6 +124,8 @@ describe 'ceilometer' do
it 'configures default transport_url' do
is_expected.to contain_ceilometer_config('DEFAULT/transport_url').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ceilometer_config('DEFAULT/rpc_response_timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ceilometer_config('DEFAULT/control_exchange').with_value('<SERVICE DEFAULT>')
end
it 'configures notifications' do
@ -137,10 +139,18 @@ describe 'ceilometer' do
end
context 'with overriden transport_url parameter' do
before { params.merge!( :default_transport_url => 'rabbit://rabbit_user:password@localhost:5673' ) }
before {
params.merge!(
:default_transport_url => 'rabbit://rabbit_user:password@localhost:5673',
:rpc_response_timeout => '120',
:control_exchange => 'ceilometer',
)
}
it 'configures transport_url' do
is_expected.to contain_ceilometer_config('DEFAULT/transport_url').with_value('rabbit://rabbit_user:password@localhost:5673')
is_expected.to contain_ceilometer_config('DEFAULT/rpc_response_timeout').with_value('120')
is_expected.to contain_ceilometer_config('DEFAULT/control_exchange').with_value('ceilometer')
end
end