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. Change-Id: Ie84427447506b57a3026c2ed0bc517f7aa38d4c8
This commit is contained in:
@@ -57,6 +57,14 @@
|
|||||||
# (Optional) Limit the number of memory bytes used by the quorum queue.
|
# (Optional) Limit the number of memory bytes used by the quorum queue.
|
||||||
# Defaults to $facts['os_service_default']
|
# 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*]
|
# [*rabbit_enable_cancel_on_failover*]
|
||||||
# (Optional) Enable x-cancel-on-ha-failover flag so that rabbitmq server will
|
# (Optional) Enable x-cancel-on-ha-failover flag so that rabbitmq server will
|
||||||
# cancel and notify consumers when queue is down.
|
# cancel and notify consumers when queue is down.
|
||||||
@@ -222,6 +230,8 @@ class cloudkitty(
|
|||||||
$rabbit_quorum_delivery_limit = $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_length = $facts['os_service_default'],
|
||||||
$rabbit_quorum_max_memory_bytes = $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_enable_cancel_on_failover = $facts['os_service_default'],
|
||||||
$kombu_ssl_ca_certs = $facts['os_service_default'],
|
$kombu_ssl_ca_certs = $facts['os_service_default'],
|
||||||
$kombu_ssl_certfile = $facts['os_service_default'],
|
$kombu_ssl_certfile = $facts['os_service_default'],
|
||||||
@@ -292,6 +302,8 @@ class cloudkitty(
|
|||||||
rabbit_quorum_delivery_limit => $rabbit_quorum_delivery_limit,
|
rabbit_quorum_delivery_limit => $rabbit_quorum_delivery_limit,
|
||||||
rabbit_quorum_max_memory_length => $rabbit_quorum_max_memory_length,
|
rabbit_quorum_max_memory_length => $rabbit_quorum_max_memory_length,
|
||||||
rabbit_quorum_max_memory_bytes => $rabbit_quorum_max_memory_bytes,
|
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,
|
enable_cancel_on_failover => $rabbit_enable_cancel_on_failover,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The ``cloudkitty`` class now has two new parameters
|
||||||
|
``rabbit_use_queue_manager`` and ``rabbit_stream_fanout``.
|
@@ -49,6 +49,8 @@ describe 'cloudkitty' do
|
|||||||
:rabbit_quorum_delivery_limit => '<SERVICE DEFAULT>',
|
:rabbit_quorum_delivery_limit => '<SERVICE DEFAULT>',
|
||||||
:rabbit_quorum_max_memory_length => '<SERVICE DEFAULT>',
|
:rabbit_quorum_max_memory_length => '<SERVICE DEFAULT>',
|
||||||
:rabbit_quorum_max_memory_bytes => '<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>',
|
:enable_cancel_on_failover => '<SERVICE DEFAULT>',
|
||||||
)
|
)
|
||||||
is_expected.to contain_oslo__messaging__notifications('cloudkitty_config').with(
|
is_expected.to contain_oslo__messaging__notifications('cloudkitty_config').with(
|
||||||
@@ -85,6 +87,8 @@ describe 'cloudkitty' do
|
|||||||
:rabbit_quorum_delivery_limit => 3,
|
:rabbit_quorum_delivery_limit => 3,
|
||||||
:rabbit_quorum_max_memory_length => 5,
|
:rabbit_quorum_max_memory_length => 5,
|
||||||
:rabbit_quorum_max_memory_bytes => 1073741824,
|
:rabbit_quorum_max_memory_bytes => 1073741824,
|
||||||
|
:rabbit_use_queue_manager => true,
|
||||||
|
:rabbit_stream_fanout => true,
|
||||||
:rabbit_enable_cancel_on_failover => false,
|
:rabbit_enable_cancel_on_failover => false,
|
||||||
:kombu_reconnect_delay => 5.0,
|
:kombu_reconnect_delay => 5.0,
|
||||||
:amqp_durable_queues => true,
|
:amqp_durable_queues => true,
|
||||||
@@ -124,6 +128,8 @@ describe 'cloudkitty' do
|
|||||||
:rabbit_quorum_delivery_limit => 3,
|
:rabbit_quorum_delivery_limit => 3,
|
||||||
:rabbit_quorum_max_memory_length => 5,
|
:rabbit_quorum_max_memory_length => 5,
|
||||||
:rabbit_quorum_max_memory_bytes => 1073741824,
|
:rabbit_quorum_max_memory_bytes => 1073741824,
|
||||||
|
:use_queue_manager => true,
|
||||||
|
:rabbit_stream_fanout => true,
|
||||||
:enable_cancel_on_failover => false,
|
:enable_cancel_on_failover => false,
|
||||||
)
|
)
|
||||||
is_expected.to contain_oslo__messaging__notifications('cloudkitty_config').with(
|
is_expected.to contain_oslo__messaging__notifications('cloudkitty_config').with(
|
||||||
|
Reference in New Issue
Block a user