openstack/puppet-aodh
Code Issues Proposed changes

Expose parameter to customize [oslo_messaging_notifications] retry

Browse Source 
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:
Takashi Kajinami 2024-09-27 22:56:37 +09:00
parent 649aac369e
commit 757b677baa
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/init.pp
View File

@ -159,20 +159,25 @@
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# [*notification_transport_url*] # [*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: # and its full configuration. Transport URLs take the form:
# transport://user:pass@host1:port[,hostN:portN]/virtual_host # transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# [*notification_driver*] # [*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. # Value can be a string or a list.
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# [*notification_topics*] # [*notification_topics*]
# (optional) AMQP topic used for OpenStack notifications # (Optional) AMQP topic used for OpenStack notifications
# Defaults to $facts['os_service_default'] # 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*] # [*purge_config*]
# (optional) Whether to set only the specified config options # (optional) Whether to set only the specified config options
# in the aodh config. # in the aodh config.
@ -213,6 +218,7 @@ class aodh (
$notification_transport_url = $facts['os_service_default'], $notification_transport_url = $facts['os_service_default'],
$notification_driver = $facts['os_service_default'], $notification_driver = $facts['os_service_default'],
$notification_topics = $facts['os_service_default'], $notification_topics = $facts['os_service_default'],
$notification_retry = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
) inherits aodh::params { ) inherits aodh::params {
@ -267,6 +273,7 @@ class aodh (
transport_url => $notification_transport_url, transport_url => $notification_transport_url,
driver => $notification_driver, driver => $notification_driver,
topics => $notification_topics, topics => $notification_topics,
retry => $notification_retry,
} }
aodh_config { aodh_config {

4
releasenotes/notes/notification-retry-9dde0e986fc1b4b3.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
The new ``aodh::notification_retry`` parameter has been added.

5
spec/classes/aodh_init_spec.rb
View File

@ -57,7 +57,8 @@ describe 'aodh' do
is_expected.to contain_oslo__messaging__notifications('aodh_config').with( is_expected.to contain_oslo__messaging__notifications('aodh_config').with(
:transport_url => '<SERVICE DEFAULT>', :transport_url => '<SERVICE DEFAULT>',
:driver => '<SERVICE DEFAULT>', :driver => '<SERVICE DEFAULT>',
:topics => '<SERVICE DEFAULT>' :topics => '<SERVICE DEFAULT>',
:retry => '<SERVICE DEFAULT>',
) )
end end
@ -108,6 +109,7 @@ describe 'aodh' do
:notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673', :notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673',
:notification_driver => 'ceilometer.compute.aodh_notifier', :notification_driver => 'ceilometer.compute.aodh_notifier',
:notification_topics => 'openstack', :notification_topics => 'openstack',
:notification_retry => 10,
:package_ensure => '2012.1.1-15.el6', :package_ensure => '2012.1.1-15.el6',
:alarm_history_time_to_live => '604800', :alarm_history_time_to_live => '604800',
:lock_path => '/var/lock/aodh', :lock_path => '/var/lock/aodh',
@ -150,6 +152,7 @@ describe 'aodh' do
:transport_url => 'rabbit://rabbit_user:password@localhost:5673', :transport_url => 'rabbit://rabbit_user:password@localhost:5673',
:driver => 'ceilometer.compute.aodh_notifier', :driver => 'ceilometer.compute.aodh_notifier',
:topics => 'openstack', :topics => 'openstack',
:retry => 10,
) )
end end