From 7c341ff213849962e4a807033bd02b53d003d2dc Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Fri, 20 Jun 2025 23:54:28 +0200
Subject: [PATCH] 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 octavia_config.

Change-Id: I75037abd5f0d17eb50d97b8355509c782325c788
---

Index: puppet-module-octavia/manifests/init.pp
===================================================================
--- puppet-module-octavia.orig/manifests/init.pp
+++ puppet-module-octavia/manifests/init.pp
@@ -95,6 +95,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.
@@ -189,6 +197,8 @@ class octavia (
   $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_ha_queues                   = $facts['os_service_default'],
   $kombu_ssl_ca_certs                 = $facts['os_service_default'],
@@ -243,6 +253,8 @@ class octavia (
     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-octavia/releasenotes/notes/queue_manager-and-stream_fanout-e70f00dee1b78d16.yaml
===================================================================
--- /dev/null
+++ puppet-module-octavia/releasenotes/notes/queue_manager-and-stream_fanout-e70f00dee1b78d16.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The ``octavia`` class now has two new parameters
+    ``rabbit_use_queue_manager`` and ``rabbit_stream_fanout``.
Index: puppet-module-octavia/spec/classes/octavia_init_spec.rb
===================================================================
--- puppet-module-octavia.orig/spec/classes/octavia_init_spec.rb
+++ puppet-module-octavia/spec/classes/octavia_init_spec.rb
@@ -56,6 +56,8 @@ describe 'octavia' 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 DEFAULT>',
+          :rabbit_stream_fanout            => '<SERVICE DEFAULT>',
           :enable_cancel_on_failover       => '<SERVICE DEFAULT>',
         )
         should contain_oslo__messaging__notifications('octavia_config').with(
@@ -89,6 +91,8 @@ describe 'octavia' 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,
           :kombu_compression                  => 'gzip',
           :kombu_reconnect_delay              => '5.0',
@@ -131,6 +135,8 @@ describe 'octavia' 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,
         )
         should contain_oslo__messaging__notifications('octavia_config').with(