Expose parameter to customize [oslo_messaging_notifications] retry
The parameter has been managed by puppet-oslo, but its value could not be set via this module. Change-Id: I551ed39a3819c171af8f9242f774dcf80d5b90a3
This commit is contained in:
parent
649aac369e
commit
757b677baa
@ -159,20 +159,25 @@
|
||||
# Defaults to $facts['os_service_default']
|
||||
#
|
||||
# [*notification_transport_url*]
|
||||
# (optional) A URL representing the messaging driver to use for notifications
|
||||
# (Optional) A URL representing the messaging driver to use for notifications
|
||||
# and its full configuration. Transport URLs take the form:
|
||||
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
|
||||
# Defaults to $facts['os_service_default']
|
||||
#
|
||||
# [*notification_driver*]
|
||||
# (optional) Driver or drivers to handle sending notifications.
|
||||
# (Optional) Driver or drivers to handle sending notifications.
|
||||
# Value can be a string or a list.
|
||||
# Defaults to $facts['os_service_default']
|
||||
#
|
||||
# [*notification_topics*]
|
||||
# (optional) AMQP topic used for OpenStack notifications
|
||||
# (Optional) AMQP topic used for OpenStack notifications
|
||||
# Defaults to $facts['os_service_default']
|
||||
#
|
||||
# [*notification_retry*]
|
||||
# (Optional) The maximum number of attempts to re-sent a notification
|
||||
# message, which failed to be delivered due to a recoverable error.
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*purge_config*]
|
||||
# (optional) Whether to set only the specified config options
|
||||
# in the aodh config.
|
||||
@ -213,6 +218,7 @@ class aodh (
|
||||
$notification_transport_url = $facts['os_service_default'],
|
||||
$notification_driver = $facts['os_service_default'],
|
||||
$notification_topics = $facts['os_service_default'],
|
||||
$notification_retry = $facts['os_service_default'],
|
||||
Boolean $purge_config = false,
|
||||
) inherits aodh::params {
|
||||
|
||||
@ -267,6 +273,7 @@ class aodh (
|
||||
transport_url => $notification_transport_url,
|
||||
driver => $notification_driver,
|
||||
topics => $notification_topics,
|
||||
retry => $notification_retry,
|
||||
}
|
||||
|
||||
aodh_config {
|
||||
|
@ -0,0 +1,4 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
The new ``aodh::notification_retry`` parameter has been added.
|
@ -57,7 +57,8 @@ describe 'aodh' do
|
||||
is_expected.to contain_oslo__messaging__notifications('aodh_config').with(
|
||||
:transport_url => '<SERVICE DEFAULT>',
|
||||
:driver => '<SERVICE DEFAULT>',
|
||||
:topics => '<SERVICE DEFAULT>'
|
||||
:topics => '<SERVICE DEFAULT>',
|
||||
:retry => '<SERVICE DEFAULT>',
|
||||
)
|
||||
end
|
||||
|
||||
@ -108,6 +109,7 @@ describe 'aodh' do
|
||||
:notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673',
|
||||
:notification_driver => 'ceilometer.compute.aodh_notifier',
|
||||
:notification_topics => 'openstack',
|
||||
:notification_retry => 10,
|
||||
:package_ensure => '2012.1.1-15.el6',
|
||||
:alarm_history_time_to_live => '604800',
|
||||
:lock_path => '/var/lock/aodh',
|
||||
@ -150,6 +152,7 @@ describe 'aodh' do
|
||||
:transport_url => 'rabbit://rabbit_user:password@localhost:5673',
|
||||
:driver => 'ceilometer.compute.aodh_notifier',
|
||||
:topics => 'openstack',
|
||||
:retry => 10,
|
||||
)
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user