From 06ff4862ca2124c3755a30eb2f524536be95aefb Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 13 Mar 2024 02:28:19 +0900 Subject: [PATCH] Expose rabbit_transient_quorum_queue Depends-on: https://review.opendev.org/911021 Change-Id: I363931363160fb4a51307e1c789a776563ec0cd8 --- manifests/init.pp | 6 ++++++ .../rabbit_transient_quorum_queue-3701e55ee80feb9b.yaml | 4 ++++ spec/classes/aodh_init_spec.rb | 3 +++ 3 files changed, 13 insertions(+) create mode 100644 releasenotes/notes/rabbit_transient_quorum_queue-3701e55ee80feb9b.yaml diff --git a/manifests/init.pp b/manifests/init.pp index 8ca6b534..5317d026 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -70,6 +70,10 @@ # (Optional) Use quorum queues in RabbitMQ. # Defaults to $facts['os_service_default'] # +# [*rabbit_transient_quorum_queue*] +# (Optional) Use quorum queues for transients queues in RabbitMQ. +# Defaults to $facts['os_service_default'] +# # [*rabbit_quorum_delivery_limit*] # (Optional) Each time a message is rdelivered to a consumer, a counter is # incremented. Once the redelivery count exceeds the delivery limit @@ -216,6 +220,7 @@ class aodh ( $rabbit_heartbeat_in_pthread = $facts['os_service_default'], $rabbit_ha_queues = $facts['os_service_default'], $rabbit_quorum_queue = $facts['os_service_default'], + $rabbit_transient_quorum_queue = $facts['os_service_default'], $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'], @@ -276,6 +281,7 @@ class aodh ( kombu_compression => $kombu_compression, amqp_durable_queues => $amqp_durable_queues, rabbit_quorum_queue => $rabbit_quorum_queue, + rabbit_transient_quorum_queue => $rabbit_transient_quorum_queue, 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, diff --git a/releasenotes/notes/rabbit_transient_quorum_queue-3701e55ee80feb9b.yaml b/releasenotes/notes/rabbit_transient_quorum_queue-3701e55ee80feb9b.yaml new file mode 100644 index 00000000..af8d2d09 --- /dev/null +++ b/releasenotes/notes/rabbit_transient_quorum_queue-3701e55ee80feb9b.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + The new ``aodh::rabbit_transient_quorum_queue`` parameter has been added. diff --git a/spec/classes/aodh_init_spec.rb b/spec/classes/aodh_init_spec.rb index a4801bdf..fbb3e08c 100644 --- a/spec/classes/aodh_init_spec.rb +++ b/spec/classes/aodh_init_spec.rb @@ -43,6 +43,7 @@ describe 'aodh' do :rabbit_ha_queues => '', :rabbit_retry_interval => '', :rabbit_quorum_queue => '', + :rabbit_transient_quorum_queue => '', :rabbit_quorum_delivery_limit => '', :rabbit_quorum_max_memory_length => '', :rabbit_quorum_max_memory_bytes => '', @@ -101,6 +102,7 @@ describe 'aodh' do :kombu_ssl_version => 'TLSv1', :rabbit_ha_queues => true, :rabbit_quorum_queue => true, + :rabbit_transient_quorum_queue => true, :rabbit_quorum_delivery_limit => 3, :rabbit_quorum_max_memory_length => 5, :rabbit_quorum_max_memory_bytes => 1073741824, @@ -140,6 +142,7 @@ describe 'aodh' do :kombu_ssl_version => 'TLSv1', :rabbit_ha_queues => true, :rabbit_quorum_queue => true, + :rabbit_transient_quorum_queue => true, :rabbit_quorum_delivery_limit => 3, :rabbit_quorum_max_memory_length => 5, :rabbit_quorum_max_memory_bytes => 1073741824,