From 725e12c27050db78f67d981b59ee57827c6d1673 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Wed, 11 Sep 2024 22:52:40 +0900
Subject: [PATCH] Add support for [oslo_messaging_rabbit]
 enable_cancel_on_failover

Depends-on: https://review.opendev.org/928440
Change-Id: I6bb4523f8f68e9e968f3f36056be156580bdfef7
---
 manifests/init.pp                                          | 7 +++++++
 .../notes/enable_cancel_on_failover-ad0b5d746db12146.yaml  | 4 ++++
 spec/classes/ceilometer_init_spec.rb                       | 1 +
 3 files changed, 12 insertions(+)
 create mode 100644 releasenotes/notes/enable_cancel_on_failover-ad0b5d746db12146.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 633d2aa4..72f550f7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -83,6 +83,11 @@
 #   (Optional) Limit the number of memory bytes used by the quorum queue.
 #   Defaults to $facts['os_service_default']
 #
+# [*enable_cancel_on_failover*]
+#   (Optional) Enable x-cancel-on-ha-failover flag so that rabbitmq server will
+#   cancel and notify consumers when queue is down.
+#   Defaults to $facts['os_service_default']
+#
 # [*rabbit_heartbeat_timeout_threshold*]
 #   (Optional) Number of seconds after which the Rabbit broker is
 #   considered down if heartbeat's keep-alive fails
@@ -180,6 +185,7 @@ class ceilometer(
   $rabbit_quorum_delivery_limit       = $facts['os_service_default'],
   $rabbit_quorum_max_memory_length    = $facts['os_service_default'],
   $rabbit_quorum_max_memory_bytes     = $facts['os_service_default'],
+  $enable_cancel_on_failover          = $facts['os_service_default'],
   $rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
   $rabbit_heartbeat_rate              = $facts['os_service_default'],
   $rabbit_heartbeat_in_pthread        = $facts['os_service_default'],
@@ -230,6 +236,7 @@ class ceilometer(
     rabbit_quorum_delivery_limit    => $rabbit_quorum_delivery_limit,
     rabbit_quorum_max_memory_length => $rabbit_quorum_max_memory_length,
     rabbit_quorum_max_memory_bytes  => $rabbit_quorum_max_memory_bytes,
+    enable_cancel_on_failover       => $enable_cancel_on_failover,
   }
 
   # Once we got here, we can act as an honey badger on the rpc used.
diff --git a/releasenotes/notes/enable_cancel_on_failover-ad0b5d746db12146.yaml b/releasenotes/notes/enable_cancel_on_failover-ad0b5d746db12146.yaml
new file mode 100644
index 00000000..13e168e0
--- /dev/null
+++ b/releasenotes/notes/enable_cancel_on_failover-ad0b5d746db12146.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    The new ``ceilometer::enable_cancel_on_failover`` parameter has been added.
diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb
index e08b1a24..47487aaf 100644
--- a/spec/classes/ceilometer_init_spec.rb
+++ b/spec/classes/ceilometer_init_spec.rb
@@ -155,6 +155,7 @@ describe 'ceilometer' do
         :rabbit_quorum_delivery_limit    => '<SERVICE DEFAULT>',
         :rabbit_quorum_max_memory_length => '<SERVICE DEFAULT>',
         :rabbit_quorum_max_memory_bytes  => '<SERVICE DEFAULT>',
+        :enable_cancel_on_failover       => '<SERVICE DEFAULT>',
       )
     end