From f7e4f73fdee289a6a741d168c09e4375ba40f91e Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Mon, 30 Sep 2024 12:21:40 +0900
Subject: [PATCH] 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: Ia5d586d36f85627d961b26d9374af3b1bb275b47
---
 manifests/init.pp                                          | 7 +++++++
 .../notes/notification-retry-33da16698e35e99d.yaml         | 4 ++++
 spec/classes/designate_init_spec.rb                        | 3 ++-
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/notification-retry-33da16698e35e99d.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index adc63916..b09779ae 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -151,6 +151,11 @@
 #   (optional) Notification Topics
 #   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 designate config.
@@ -199,6 +204,7 @@ class designate(
   $notification_driver                = $facts['os_service_default'],
   $notification_transport_url         = $facts['os_service_default'],
   $notification_topics                = $facts['os_service_default'],
+  $notification_retry                 = $facts['os_service_default'],
   Boolean $purge_config               = false,
   $amqp_durable_queues                = $facts['os_service_default'],
   $default_ttl                        = $facts['os_service_default'],
@@ -250,6 +256,7 @@ class designate(
     driver        => $notification_driver,
     transport_url => $notification_transport_url,
     topics        => $notification_topics,
+    retry         => $notification_retry,
   }
 
   # default setting
diff --git a/releasenotes/notes/notification-retry-33da16698e35e99d.yaml b/releasenotes/notes/notification-retry-33da16698e35e99d.yaml
new file mode 100644
index 00000000..f5557fea
--- /dev/null
+++ b/releasenotes/notes/notification-retry-33da16698e35e99d.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    The new ``designate::notification_retry`` parameter has been added.
diff --git a/spec/classes/designate_init_spec.rb b/spec/classes/designate_init_spec.rb
index 3714c606..14a6a943 100644
--- a/spec/classes/designate_init_spec.rb
+++ b/spec/classes/designate_init_spec.rb
@@ -104,7 +104,8 @@ describe 'designate' do
       is_expected.to contain_oslo__messaging__notifications('designate_config').with(
         :driver        => '<SERVICE DEFAULT>',
         :transport_url => '<SERVICE DEFAULT>',
-        :topics        => '<SERVICE DEFAULT>'
+        :topics        => '<SERVICE DEFAULT>',
+        :retry         => '<SERVICE DEFAULT>',
       )
       is_expected.to contain_oslo__messaging__rabbit('designate_config').with(
         :kombu_ssl_version               => '<SERVICE DEFAULT>',