Author: Thomas Goirand <zigo@debian.org>
Date: Sun, 22 Jun 2025 23:35:41 +0200
Subject: Add queue_manager and stream_fanout
 This patch adds two new parameters to the toplevel class:
 - rabbit_use_queue_manager
 - rabbit_stream_fanout
 .
 that are already handled by the oslo::messaging::rabbit class, which
 makes it impossible to set using magnum_config.
Change-Id: Id428eb2a38c71730b5b78be27df28523cd3f3b35
Forwarded: https://review.opendev.org/c/openstack/puppet-magnum/+/953066
Last-Update: 2025-06-22

Index: puppet-module-magnum/manifests/init.pp
===================================================================
--- puppet-module-magnum.orig/manifests/init.pp
+++ puppet-module-magnum/manifests/init.pp
@@ -107,6 +107,14 @@
 #   (Optional) Limit the number of memory bytes used by the quorum queue.
 #   Defaults to $facts['os_service_default']
 #
+# [*rabbit_use_queue_manager*]
+#   (Optional) Should we use consistant queue names or random ones.
+#   Defaults to $facts['os_service_default']
+#
+# [*rabbit_stream_fanout*]
+#   (Optional) Use stream queues in RabbitMQ (x-queue-type: stream).
+#   Defaults to $facts['os_service_default']
+#
 # [*rabbit_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.
@@ -184,6 +192,8 @@ class magnum(
   $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'],
+  $rabbit_use_queue_manager           = $facts['os_service_default'],
+  $rabbit_stream_fanout               = $facts['os_service_default'],
   $rabbit_enable_cancel_on_failover   = $facts['os_service_default'],
   $rabbit_use_ssl                     = $facts['os_service_default'],
   $kombu_ssl_ca_certs                 = $facts['os_service_default'],
@@ -235,6 +245,8 @@ class magnum(
     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,
+    use_queue_manager               => $rabbit_use_queue_manager,
+    rabbit_stream_fanout            => $rabbit_stream_fanout,
     enable_cancel_on_failover       => $rabbit_enable_cancel_on_failover,
   }
 
Index: puppet-module-magnum/releasenotes/notes/queue_manager-and-stream_fanout-2d19bdfa310bd1b8.yaml
===================================================================
--- /dev/null
+++ puppet-module-magnum/releasenotes/notes/queue_manager-and-stream_fanout-2d19bdfa310bd1b8.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The ``magnum`` class now has two new parameters
+    ``rabbit_use_queue_manager`` and ``rabbit_stream_fanout``.
Index: puppet-module-magnum/spec/classes/magnum_init_spec.rb
===================================================================
--- puppet-module-magnum.orig/spec/classes/magnum_init_spec.rb
+++ puppet-module-magnum/spec/classes/magnum_init_spec.rb
@@ -53,6 +53,8 @@ describe 'magnum' do
           :rabbit_quorum_delivery_limit    => '<SERVICE DEFAULT>',
           :rabbit_quorum_max_memory_length => '<SERVICE DEFAULT>',
           :rabbit_quorum_max_memory_bytes  => '<SERVICE DEFAULT>',
+          :use_queue_manager               => '<SERVICE DEAFULT>',
+          :rabbit_stream_fanout            => '<SERVICE DEFAULT>',
           :enable_cancel_on_failover       => '<SERVICE DEFAULT>',
         )
       end
@@ -92,6 +94,8 @@ describe 'magnum' do
           :rabbit_quorum_delivery_limit       => 3,
           :rabbit_quorum_max_memory_length    => 5,
           :rabbit_quorum_max_memory_bytes     => 1073741824,
+          :rabbit_use_queue_manager           => true,
+          :rabbit_stream_fanout               => true,
           :rabbit_enable_cancel_on_failover   => false,
         }
       end
@@ -132,6 +136,8 @@ describe 'magnum' do
           :rabbit_quorum_delivery_limit    => 3,
           :rabbit_quorum_max_memory_length => 5,
           :rabbit_quorum_max_memory_bytes  => 1073741824,
+          :use_queue_manager               => true,
+          :rabbit_stream_fanout            => true,
           :enable_cancel_on_failover       => false,
         )
       end