Add support for [oslo_messaging_rabbit] enable_cancel_on_failover

Depends-on: https://review.opendev.org/928440
Change-Id: Ie4ff86a1284548d591cb7d190bafc71a18a5ebdb
This commit is contained in:
Takashi Kajinami 2024-09-27 10:56:12 +09:00
parent f0847361fe
commit b0f5ecb6d8
3 changed files with 15 additions and 0 deletions

View File

@ -88,6 +88,11 @@
# (Optional) Limit the number of memory bytes used by the quorum queue.
# 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.
# Defaults to $facts['os_service_default']
#
# [*rabbit_heartbeat_timeout_threshold*]
# (optional) Number of seconds after which the RabbitMQ broker is considered
# down if the heartbeat keepalive fails. Any value >0 enables heartbeats.
@ -271,6 +276,7 @@ class barbican::api (
$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_enable_cancel_on_failover = $facts['os_service_default'],
$amqp_durable_queues = $facts['os_service_default'],
$enable_queue = $facts['os_service_default'],
$queue_namespace = $facts['os_service_default'],
@ -342,6 +348,7 @@ class barbican::api (
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,
enable_cancel_on_failover => $rabbit_enable_cancel_on_failover,
}
oslo::messaging::default { 'barbican_config':

View File

@ -0,0 +1,5 @@
---
features:
- |
The new ``barbican::api::rabbit_enable_cancel_on_failover`` parameter has
been added.

View File

@ -42,6 +42,7 @@ describe 'barbican::api' do
:rabbit_quorum_delivery_limit => '<SERVICE DEFAULT>',
:rabbit_quorum_max_memory_length => '<SERVICE DEFAULT>',
:rabbit_quorum_max_memory_bytes => '<SERVICE DEFAULT>',
:rabbit_enable_cancel_on_failover => '<SERVICE DEFAULT>',
:amqp_durable_queues => '<SERVICE DEFAULT>',
:max_allowed_secret_in_bytes => '<SERVICE DEFAULT>',
:max_allowed_request_size_in_bytes => '<SERVICE DEFAULT>',
@ -92,6 +93,7 @@ describe 'barbican::api' do
:rabbit_quorum_delivery_limit => 3,
:rabbit_quorum_max_memory_length => 5,
:rabbit_quorum_max_memory_bytes => 1073741824,
:rabbit_enable_cancel_on_failover => false,
:amqp_durable_queues => true,
:enable_queue => true,
:queue_namespace => 'barbican1',
@ -189,6 +191,7 @@ describe 'barbican::api' do
:rabbit_quorum_delivery_limit => param_hash[:rabbit_quorum_delivery_limit],
:rabbit_quorum_max_memory_length => param_hash[:rabbit_quorum_max_memory_length],
:rabbit_quorum_max_memory_bytes => param_hash[:rabbit_quorum_max_memory_bytes],
:enable_cancel_on_failover => param_hash[:rabbit_enable_cancel_on_failover],
)
end