From 94b10397b42c2425a5a3d457e034ebf37a41bf6d Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: 2025年3月12日 17:04:36 +0100
Subject: [PATCH] Add an amqp_auto_delete param
Change-Id: I7069781a6f97beb626a8e79a03de9f4182e8372a
---
 manifests/messaging/rabbit.pp &#124; 6 ++++++
 releasenotes/notes/amqp_auto_delete-e2734589468a98a2.yaml &#124; 5 +++++
 spec/defines/oslo_messaging_rabbit_spec.rb &#124; 1 +
 3 files changed, 12 insertions(+)
 create mode 100644 releasenotes/notes/amqp_auto_delete-e2734589468a98a2.yaml
diff --git a/manifests/messaging/rabbit.pp b/manifests/messaging/rabbit.pp
index 7309c51..30b84b6 100644
--- a/manifests/messaging/rabbit.pp
+++ b/manifests/messaging/rabbit.pp
@@ -11,6 +11,10 @@
 # (optional) Define queues as "durable" to rabbitmq. (boolean value)
 # 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']
+#
 # [*kombu_ssl_version*]
 # (Optional) SSL version to use (valid only if SSL enabled). '
 # Valid values are TLSv1 and SSLv23. SSLv2, SSLv3, TLSv1_1,
@@ -161,6 +165,7 @@
 #
 define oslo::messaging::rabbit(
 $amqp_durable_queues = $facts['os_service_default'],
+ $amqp_auto_delete = $facts['os_service_default'],
 $kombu_ssl_version = $facts['os_service_default'],
 $kombu_ssl_keyfile = $facts['os_service_default'],
 $kombu_ssl_certfile = $facts['os_service_default'],
@@ -227,6 +232,7 @@ define oslo::messaging::rabbit(
 
 $rabbit_options = {
 'oslo_messaging_rabbit/amqp_durable_queues' => { value => $amqp_durable_queues },
+ 'oslo_messaging_rabbit/amqp_auto_delete' => { value => $amqp_auto_delete },
 'oslo_messaging_rabbit/heartbeat_rate' => { value => $heartbeat_rate },
 'oslo_messaging_rabbit/heartbeat_in_pthread' => { value => pick($heartbeat_in_pthread, $facts['os_service_default']) },
 'oslo_messaging_rabbit/heartbeat_timeout_threshold' => { value => $heartbeat_timeout_threshold },
diff --git a/releasenotes/notes/amqp_auto_delete-e2734589468a98a2.yaml b/releasenotes/notes/amqp_auto_delete-e2734589468a98a2.yaml
new file mode 100644
index 0000000..5022078
--- /dev/null
+++ b/releasenotes/notes/amqp_auto_delete-e2734589468a98a2.yaml
@@ -0,0 +1,5 @@
+---
+features:
+ - &#124;
+ A new parameter `amqp_auto_delete` has been added to allow automatic
+ deletion of transient queues.
diff --git a/spec/defines/oslo_messaging_rabbit_spec.rb b/spec/defines/oslo_messaging_rabbit_spec.rb
index c77e29d..858d941 100644
--- a/spec/defines/oslo_messaging_rabbit_spec.rb
+++ b/spec/defines/oslo_messaging_rabbit_spec.rb
@@ -9,6 +9,7 @@ describe 'oslo::messaging::rabbit' do
 context 'with default parameters' do
 it 'configure oslo_messaging_rabbit default params' do
 is_expected.to contain_keystone_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('<service DEFAULT>')
+ is_expected.to contain_keystone_config('oslo_messaging_rabbit/amqp_auto_delete').with_value('<service DEFAULT>')
 is_expected.to contain_keystone_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('<service DEFAULT>')
 is_expected.to contain_keystone_config('oslo_messaging_rabbit/kombu_missing_consumer_retry_timeout').with_value('<service DEFAULT>')
 is_expected.to contain_keystone_config('oslo_messaging_rabbit/kombu_failover_strategy').with_value('<service DEFAULT>')
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/puppet-oslo/commit/94b10397b42c2425a5a3d457e034ebf37a41bf6d.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/puppet-oslo/commit/94b10397b42c2425a5a3d457e034ebf37a41bf6d.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>