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: I1f45940e461ecadc8c3da4973cbbf2833d541223

manifests/init.pp

@@ -17,6 +17,12 @@
 #   the same time.
 #   Defaults to $facts['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:
+#     transport://user:pass@host1:port[,hostN:portN]/virtual_host
+#   Defaults to $facts['os_service_default']
+#
 # [*notification_topics*]
 #   (Optional) AMQP topic used for OpenStack notifications (list value)
 #   Defaults to 'notifications'.
@@ -26,6 +32,11 @@
 #   Value can be a string or a list.
 #   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'].
+#
 # [*package_ensure*]
 #   (Optional) ensure state for package.
 #   Defaults to 'present'.
@@ -50,12 +61,6 @@
 #   option.
 #   Defaults to $facts['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:
-#     transport://user:pass@host1:port[,hostN:portN]/virtual_host
-#   Defaults to $facts['os_service_default']
-#
 # [*rabbit_ha_queues*]
 #   (Optional) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this
 #   option, you must wipe the RabbitMQ database. (boolean value)
@@ -171,14 +176,15 @@ class ceilometer(
   $telemetry_secret,
   $http_timeout                       = $facts['os_service_default'],
   $max_parallel_requests              = $facts['os_service_default'],
+  $notification_transport_url         = $facts['os_service_default'],
   $notification_topics                = ['notifications'],
   $notification_driver                = $facts['os_service_default'],
+  $notification_retry                 = $facts['os_service_default'],
   $package_ensure                     = 'present',
   $executor_thread_pool_size          = $facts['os_service_default'],
   $default_transport_url              = $facts['os_service_default'],
   $rpc_response_timeout               = $facts['os_service_default'],
   $control_exchange                   = $facts['os_service_default'],
-  $notification_transport_url         = $facts['os_service_default'],
   $rabbit_ha_queues                   = $facts['os_service_default'],
   $rabbit_quorum_queue                = $facts['os_service_default'],
   $rabbit_transient_quorum_queue      = $facts['os_service_default'],
@@ -251,6 +257,7 @@ class ceilometer(
     transport_url => $notification_transport_url,
     topics        => $notification_topics,
     driver        => $notification_driver,
+    retry         => $notification_retry,
   }
 
   oslo::messaging::default { 'ceilometer_config':

releasenotes/notes/notification-retry-604bbd484bfadc18.yaml

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

spec/classes/ceilometer_init_spec.rb

@@ -89,7 +89,8 @@ describe 'ceilometer' do
       is_expected.to contain_oslo__messaging__notifications('ceilometer_config').with(
         :transport_url => '<SERVICE DEFAULT>',
         :driver        => '<SERVICE DEFAULT>',
-        :topics        => ['notifications']
+        :topics        => ['notifications'],
+        :retry         => '<SERVICE DEFAULT>',
       )
     end
 
@@ -124,6 +125,7 @@ describe 'ceilometer' do
           :notification_topics        => ['notifications', 'custom'],
           :notification_driver        => 'messagingv2',
           :notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673',
+          :notification_retry         => 10,
         )
       }
 
@@ -131,7 +133,8 @@ describe 'ceilometer' do
         is_expected.to contain_oslo__messaging__notifications('ceilometer_config').with(
           :transport_url => 'rabbit://rabbit_user:password@localhost:5673',
           :driver        => 'messagingv2',
-          :topics        => ['notifications', 'custom']
+          :topics        => ['notifications', 'custom'],
+          :retry         => 10,
         )
       end
     end