openstack/puppet-glance
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: I192dbd3a72a5ff13d670d992d8def94e2be4db2b
This commit is contained in:
Takashi Kajinami 2024-09-25 22:02:49 +09:00
parent c29243ded4
commit 67f442f7d9
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/notify/rabbitmq.pp
View File

@ -80,6 +80,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_use_ssl*]
# (Optional) Connect over SSL for RabbitMQ. (boolean value)
# Defaults to $facts['os_service_default']
@ -149,6 +154,7 @@ class glance::notify::rabbitmq(
$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_use_ssl = $facts['os_service_default'],
$kombu_ssl_ca_certs = $facts['os_service_default'],
$kombu_ssl_certfile = $facts['os_service_default'],
@ -184,6 +190,7 @@ class glance::notify::rabbitmq(
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 { 'glance_api_config':

5
releasenotes/notes/enable_cancel_on_failover-93236283513d91ba.yaml Normal file
View File

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

3
spec/classes/glance_notify_rabbitmq_spec.rb
View File

@ -23,6 +23,7 @@ describe 'glance::notify::rabbitmq' 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>',
) }
it { is_expected.to contain_oslo__messaging__default('glance_api_config').with(
@ -57,6 +58,7 @@ describe 'glance::notify::rabbitmq' do
:rabbit_quorum_delivery_limit => 3,
:rabbit_quorum_max_memory_length => 5,
:rabbit_quorum_max_memory_bytes => 1073741824,
:rabbit_enable_cancel_on_failover => false,
:rabbit_use_ssl => true,
:kombu_ssl_ca_certs => '/etc/ca.cert',
:kombu_ssl_certfile => '/etc/certfile',
@ -91,6 +93,7 @@ describe 'glance::notify::rabbitmq' do
:rabbit_quorum_delivery_limit => 3,
:rabbit_quorum_max_memory_length => 5,
:rabbit_quorum_max_memory_bytes => 1073741824,
:enable_cancel_on_failover => false,
) }
it { is_expected.to contain_oslo__messaging__default('glance_api_config').with(