openstack/puppet-glance
Code Issues Proposed changes

Add queue_manager and stream_fanout

Browse Source 
This patch adds two new parameters to the glance::notify::rabbitmq 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 glance_api_config.

Change-Id: I3e118d4c58778a3e887e710cde83ddbfa8c2877b
This commit is contained in:
Thomas Goirand
2025-06-30 16:31:33 +02:00
parent d36598fa2c
commit 5fd27a084c
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/notify/rabbitmq.pp
View File

@@ -73,6 +73,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.
@@ -176,6 +184,8 @@ class glance::notify::rabbitmq(
$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'],
$rabbit_use_ssl = $facts['os_service_default'],
$kombu_ssl_ca_certs = $facts['os_service_default'],
@@ -228,6 +238,8 @@ Use the notification_topic parameter instead.")
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,
}

5
releasenotes/notes/queue_manager-and-stream_fanout-3b4ca0607c93d9f4.yaml Normal file
View File

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

6
spec/classes/glance_notify_rabbitmq_spec.rb
View File

@@ -25,6 +25,8 @@ describe 'glance::notify::rabbitmq' 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>',
) }
@@ -61,6 +63,8 @@ describe 'glance::notify::rabbitmq' 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,
:rabbit_use_ssl => true,
:kombu_ssl_ca_certs => '/etc/ca.cert',
@@ -101,6 +105,8 @@ describe 'glance::notify::rabbitmq' 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,
) }