diff --git a/manifests/init.pp b/manifests/init.pp index 82b0798c..8804e147 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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 { diff --git a/releasenotes/notes/notification-retry-9dde0e986fc1b4b3.yaml b/releasenotes/notes/notification-retry-9dde0e986fc1b4b3.yaml new file mode 100644 index 00000000..50724783 --- /dev/null +++ b/releasenotes/notes/notification-retry-9dde0e986fc1b4b3.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + The new ``aodh::notification_retry`` parameter has been added. diff --git a/spec/classes/aodh_init_spec.rb b/spec/classes/aodh_init_spec.rb index 73c882cd..d43ab845 100644 --- a/spec/classes/aodh_init_spec.rb +++ b/spec/classes/aodh_init_spec.rb @@ -57,7 +57,8 @@ describe 'aodh' do is_expected.to contain_oslo__messaging__notifications('aodh_config').with( :transport_url => '', :driver => '', - :topics => '' + :topics => '', + :retry => '', ) 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