From eee6922388cc0c413b85c15612cf45441de79ff7 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 14 Mar 2024 09:52:30 +0900 Subject: [PATCH] Expose rabbit_transient_quorum_queue Depends-on: https://review.opendev.org/911021 Change-Id: I2225e1c62a0f1145099987cbc7951afa53090538 --- manifests/init.pp | 6 ++++++ .../rabbit_transient_quorum_queue-7866f8e36097eaf9.yaml | 5 +++++ spec/classes/octavia_init_spec.rb | 3 +++ 3 files changed, 14 insertions(+) create mode 100644 releasenotes/notes/rabbit_transient_quorum_queue-7866f8e36097eaf9.yaml diff --git a/manifests/init.pp b/manifests/init.pp index caf41e07..80845fe4 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -65,6 +65,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 @@ -213,6 +217,7 @@ class octavia ( $rabbit_heartbeat_rate = $facts['os_service_default'], $rabbit_heartbeat_in_pthread = $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'], @@ -275,6 +280,7 @@ class octavia ( 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-7866f8e36097eaf9.yaml b/releasenotes/notes/rabbit_transient_quorum_queue-7866f8e36097eaf9.yaml new file mode 100644 index 00000000..9f7daf64 --- /dev/null +++ b/releasenotes/notes/rabbit_transient_quorum_queue-7866f8e36097eaf9.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``octavia::rabbit_transient_quorum_queue`` parameter has been + added. diff --git a/spec/classes/octavia_init_spec.rb b/spec/classes/octavia_init_spec.rb index a47c34fd..c3adc81c 100644 --- a/spec/classes/octavia_init_spec.rb +++ b/spec/classes/octavia_init_spec.rb @@ -49,6 +49,7 @@ describe 'octavia' do :kombu_compression => '', :amqp_durable_queues => '', :rabbit_quorum_queue => '', + :rabbit_transient_quorum_queue => '', :rabbit_quorum_delivery_limit => '', :rabbit_quorum_max_memory_length => '', :rabbit_quorum_max_memory_bytes => '', @@ -93,6 +94,7 @@ describe 'octavia' do :rabbit_heartbeat_rate => '10', :rabbit_heartbeat_in_pthread => 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, @@ -130,6 +132,7 @@ describe 'octavia' do :kombu_compression => 'gzip', :amqp_durable_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,