diff --git a/manifests/init.pp b/manifests/init.pp index 7d19a80b..9a485144 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -87,6 +87,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'] +# # [*kombu_ssl_ca_certs*] # (optional) SSL certification authority file (valid only if SSL enabled). # Defaults to $facts['os_service_default'] @@ -166,6 +171,7 @@ class octavia ( $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'], $rabbit_ha_queues = $facts['os_service_default'], $kombu_ssl_ca_certs = $facts['os_service_default'], $kombu_ssl_certfile = $facts['os_service_default'], @@ -215,6 +221,7 @@ class octavia ( 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 { 'octavia_config': diff --git a/releasenotes/notes/enable_cancel_on_failover-d9c143d33af343dc.yaml b/releasenotes/notes/enable_cancel_on_failover-d9c143d33af343dc.yaml new file mode 100644 index 00000000..e3e5ace1 --- /dev/null +++ b/releasenotes/notes/enable_cancel_on_failover-d9c143d33af343dc.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``octavia::rabbit_enable_cancel_on_failover`` parameter has been + added. diff --git a/spec/classes/octavia_init_spec.rb b/spec/classes/octavia_init_spec.rb index cde39159..15879b27 100644 --- a/spec/classes/octavia_init_spec.rb +++ b/spec/classes/octavia_init_spec.rb @@ -54,6 +54,7 @@ describe 'octavia' do :rabbit_quorum_delivery_limit => '', :rabbit_quorum_max_memory_length => '', :rabbit_quorum_max_memory_bytes => '', + :enable_cancel_on_failover => '', ) should contain_oslo__messaging__notifications('octavia_config').with( :transport_url => '', @@ -84,6 +85,7 @@ describe 'octavia' do :rabbit_quorum_delivery_limit => 3, :rabbit_quorum_max_memory_length => 5, :rabbit_quorum_max_memory_bytes => 1073741824, + :rabbit_enable_cancel_on_failover => false, :kombu_compression => 'gzip', :kombu_reconnect_delay => '5.0', :kombu_failover_strategy => 'shuffle', @@ -123,6 +125,7 @@ describe 'octavia' do :rabbit_quorum_delivery_limit => 3, :rabbit_quorum_max_memory_length => 5, :rabbit_quorum_max_memory_bytes => 1073741824, + :enable_cancel_on_failover => false, ) should contain_oslo__messaging__notifications('octavia_config').with( :transport_url => 'rabbit://rabbit_user:password@localhost:5673',