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 designate_config.

Change-Id: Idca6f53e1304f84350bdd897c4060a5596677b45
This commit is contained in:
Thomas Goirand
2025-06-20 23:45:24 +02:00
parent c6f03073b8
commit 5aaa3d1c23
3 changed files with 23 additions and 0 deletions

View File

@@ -102,6 +102,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.
@@ -204,6 +212,8 @@ class designate(
$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'],
$kombu_ssl_ca_certs = $facts['os_service_default'],
$kombu_ssl_certfile = $facts['os_service_default'],
@@ -261,6 +271,8 @@ class designate(
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,
}

View File

@@ -0,0 +1,5 @@
---
features:
- |
The ``designate`` class now has two new parameters
``rabbit_use_queue_manager`` and ``rabbit_stream_fanout``.

View File

@@ -128,6 +128,8 @@ describe 'designate' 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>',
)
end
@@ -149,6 +151,8 @@ describe 'designate' 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_reconnect_delay => '1.0',
:kombu_failover_strategy => 'shuffle',
@@ -170,6 +174,8 @@ describe 'designate' 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,
:kombu_reconnect_delay => '1.0',
:kombu_failover_strategy => 'shuffle'