openstack/puppet-trove
Code Issues Proposed changes

Add support for [oslo_messaging_rabbit] enable_cancel_on_failover

Browse Source 
Depends-on: https://review.opendev.org/928440
Change-Id: I297aa13ac9c6d3dcc4c0b34fafe4ffefac86ee65
This commit is contained in:
Takashi Kajinami 2024-09-26 11:18:34 +09:00
parent 03f3cc6922
commit 32e7d18998
5 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/guestagent.pp
View File

@ -187,6 +187,7 @@ class trove::guestagent(
rabbit_quorum_delivery_limit => $::trove::rabbit_quorum_delivery_limit,
rabbit_quorum_max_memory_length => $::trove::rabbit_quorum_max_memory_length,
rabbit_quorum_max_memory_bytes => $::trove::rabbit_quorum_max_memory_bytes,
enable_cancel_on_failover => $::trove::rabbit_enable_cancel_on_failover,
}
oslo::log { 'trove_guestagent_config':

7
manifests/init.pp
View File

@ -124,6 +124,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_reconnect_delay*]
# (optional) How long to wait before reconnecting in response to an AMQP
# consumer cancel notification.
@ -252,6 +257,7 @@ class trove(
$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'],
@ -369,5 +375,6 @@ class trove(
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,
}
}

5
releasenotes/notes/enable_cancel_on_failover-230b2088cad64cd9.yaml Normal file
View File

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

1
spec/classes/trove_guestagent_spec.rb
View File

@ -64,6 +64,7 @@ describe 'trove::guestagent' do
:rabbit_quorum_delivery_limit => '<SERVICE DEFAULT>',
:rabbit_quorum_max_memory_length => '<SERVICE DEFAULT>',
:rabbit_quorum_max_memory_bytes => '<SERVICE DEFAULT>',
:enable_cancel_on_failover => '<SERVICE DEFAULT>',
)
is_expected.to contain_trove_guestagent_config('DEFAULT/swift_url').with_value('<SERVICE DEFAULT>')

1
spec/classes/trove_init_spec.rb
View File

@ -72,6 +72,7 @@ describe 'trove' do
:rabbit_quorum_delivery_limit => '<SERVICE DEFAULT>',
:rabbit_quorum_max_memory_length => '<SERVICE DEFAULT>',
:rabbit_quorum_max_memory_bytes => '<SERVICE DEFAULT>',
:enable_cancel_on_failover => '<SERVICE DEFAULT>',
)
is_expected.to contain_oslo__messaging__notifications('trove_config').with(
:transport_url => '<SERVICE DEFAULT>',