1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
|
Description: 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 cloudkitty_config.
Author: Thomas Goirand <zigo@debian.org>
Date: Fri, 20 Jun 2025 23:40:02 +0200
Change-Id: Ie84427447506b57a3026c2ed0bc517f7aa38d4c8
Forwarded: https://review.opendev.org/c/openstack/puppet-cloudkitty/+/953020
Last-Update: 2025-06-22
Index: puppet-module-cloudkitty/manifests/init.pp
===================================================================
--- puppet-module-cloudkitty.orig/manifests/init.pp
+++ puppet-module-cloudkitty/manifests/init.pp
@@ -67,6 +67,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.
@@ -221,6 +229,8 @@ class cloudkitty(
$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'],
@@ -289,6 +299,8 @@ class cloudkitty(
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,
}
Index: puppet-module-cloudkitty/releasenotes/notes/queue_manager-and-stream_fanout-9c2351547483e224.yaml
===================================================================
--- /dev/null
+++ puppet-module-cloudkitty/releasenotes/notes/queue_manager-and-stream_fanout-9c2351547483e224.yaml
@@ -0,0 +1,5 @@
+---
+features:
+ - |
+ The ``cloudkitty`` class now has two new parameters
+ ``rabbit_use_queue_manager`` and ``rabbit_stream_fanout``.
Index: puppet-module-cloudkitty/spec/classes/cloudkitty_init_spec.rb
===================================================================
--- puppet-module-cloudkitty.orig/spec/classes/cloudkitty_init_spec.rb
+++ puppet-module-cloudkitty/spec/classes/cloudkitty_init_spec.rb
@@ -49,6 +49,8 @@ describe 'cloudkitty' 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>',
)
is_expected.to contain_oslo__messaging__notifications('cloudkitty_config').with(
@@ -85,6 +87,8 @@ describe 'cloudkitty' 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 => 5.0,
:amqp_durable_queues => true,
@@ -124,6 +128,8 @@ describe 'cloudkitty' 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,
)
is_expected.to contain_oslo__messaging__notifications('cloudkitty_config').with(
|
