From 35b64e9d49e0c6c34f5c06da0a83fbbe24342694 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 1 Oct 2024 14:40:28 +0900 Subject: [PATCH] Add support for [oslo_messaging_rabbit] enable_cancel_on_failover Depends-on: https://review.opendev.org/928440 Change-Id: Iaaab2ed6a7b4b44642f326863060b7ca5311de24 --- manifests/init.pp | 7 +++++++ .../notes/enable_cancel_on_failover-f93af1fd0370ee66.yaml | 5 +++++ spec/classes/vitrage_init_spec.rb | 2 ++ 3 files changed, 14 insertions(+) create mode 100644 releasenotes/notes/enable_cancel_on_failover-f93af1fd0370ee66.yaml diff --git a/manifests/init.pp b/manifests/init.pp index a1bea6b..4839eb6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -54,6 +54,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. @@ -166,6 +171,7 @@ class vitrage ( $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'], $kombu_ssl_ca_certs = $facts['os_service_default'], $kombu_ssl_certfile = $facts['os_service_default'], $kombu_ssl_keyfile = $facts['os_service_default'], @@ -202,6 +208,7 @@ class vitrage ( 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, heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold, heartbeat_rate => $rabbit_heartbeat_rate, heartbeat_in_pthread => $rabbit_heartbeat_in_pthread, diff --git a/releasenotes/notes/enable_cancel_on_failover-f93af1fd0370ee66.yaml b/releasenotes/notes/enable_cancel_on_failover-f93af1fd0370ee66.yaml new file mode 100644 index 0000000..f1ade5f --- /dev/null +++ b/releasenotes/notes/enable_cancel_on_failover-f93af1fd0370ee66.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``vitrage::rabbit_enable_cancel_on_failover`` parameter has been + added. diff --git a/spec/classes/vitrage_init_spec.rb b/spec/classes/vitrage_init_spec.rb index daff8cb..fcb9c40 100644 --- a/spec/classes/vitrage_init_spec.rb +++ b/spec/classes/vitrage_init_spec.rb @@ -47,6 +47,7 @@ describe 'vitrage' do :rabbit_quorum_delivery_limit => '', :rabbit_quorum_max_memory_length => '', :rabbit_quorum_max_memory_bytes => '', + :enable_cancel_on_failover => '', ) is_expected.to contain_oslo__messaging__notifications('vitrage_config').with( :transport_url => '', @@ -119,6 +120,7 @@ describe 'vitrage' do :rabbit_quorum_delivery_limit => '', :rabbit_quorum_max_memory_length => '', :rabbit_quorum_max_memory_bytes => '', + :enable_cancel_on_failover => '', ) is_expected.to contain_oslo__messaging__notifications('vitrage_config').with( :transport_url => 'rabbit://rabbit_user:password@localhost:5673',