From d8069626a67bfb75e086ced569275a44629ca0f4 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Thu, 13 Mar 2025 11:25:32 +0100
Subject: [PATCH] Add an amqp_auto_delete param

The amqp_auto_delete option needs this patch:
https://review.opendev.org/c/openstack/puppet-oslo/+/944132

Change-Id: I6641d15fa236914f33d7acf06295744237862187
---
 manifests/init.pp                                         | 6 ++++++
 releasenotes/notes/amqp_auto_delete-8b592cb0908c8156.yaml | 5 +++++
 spec/classes/neutron_init_spec.rb                         | 1 +
 3 files changed, 12 insertions(+)
 create mode 100644 releasenotes/notes/amqp_auto_delete-8b592cb0908c8156.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index cf102c24c..ef5242434 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -164,6 +164,10 @@
 #   automatically deleted. The parameter affects only reply and fanout queues.
 #   Defaults to $facts['os_service_default']
 #
+# [*amqp_auto_delete*]
+#   (Optional) Define if transient queues should be auto-deleted (boolean value)
+#   Defaults to $facts['os_service_default']
+#
 # [*amqp_durable_queues*]
 #   (optional) Define queues as "durable" to rabbitmq.
 #   Defaults to $facts['os_service_default']
@@ -325,6 +329,7 @@ class neutron (
   $rabbit_use_ssl                       = $facts['os_service_default'],
   $rabbit_transient_queues_ttl          = $facts['os_service_default'],
   $amqp_durable_queues                  = $facts['os_service_default'],
+  $amqp_auto_delete                     = $facts['os_service_default'],
   $kombu_ssl_ca_certs                   = $facts['os_service_default'],
   $kombu_ssl_certfile                   = $facts['os_service_default'],
   $kombu_ssl_keyfile                    = $facts['os_service_default'],
@@ -431,6 +436,7 @@ class neutron (
     kombu_ssl_certfile                   => $kombu_ssl_certfile,
     kombu_ssl_keyfile                    => $kombu_ssl_keyfile,
     amqp_durable_queues                  => $amqp_durable_queues,
+    amqp_auto_delete                     => $amqp_auto_delete,
     rabbit_ha_queues                     => $rabbit_ha_queues,
     kombu_ssl_version                    => $kombu_ssl_version,
     rabbit_quorum_queue                  => $rabbit_quorum_queue,
diff --git a/releasenotes/notes/amqp_auto_delete-8b592cb0908c8156.yaml b/releasenotes/notes/amqp_auto_delete-8b592cb0908c8156.yaml
new file mode 100644
index 000000000..bb24709f3
--- /dev/null
+++ b/releasenotes/notes/amqp_auto_delete-8b592cb0908c8156.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Add a new ``amqp_auto_delete`` parameter, so that transient queues are
+    automatically deleted.
diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb
index b0a8269f5..4e0195508 100644
--- a/spec/classes/neutron_init_spec.rb
+++ b/spec/classes/neutron_init_spec.rb
@@ -73,6 +73,7 @@ describe 'neutron' do
         :kombu_failover_strategy              => '<SERVICE DEFAULT>',
         :kombu_compression                    => '<SERVICE DEFAULT>',
         :amqp_durable_queues                  => '<SERVICE DEFAULT>',
+        :amqp_auto_delete                     => '<SERVICE DEFAULT>',
         :rabbit_ha_queues                     => '<SERVICE DEFAULT>',
         :rabbit_quorum_queue                  => '<SERVICE DEFAULT>',
         :rabbit_transient_quorum_queue        => '<SERVICE DEFAULT>',