openstack/puppet-manila
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: Ieda326d7c6b92fb6ac7797e55d6b6f4161a69c86
This commit is contained in:
Takashi Kajinami 2024-09-25 21:50:31 +09:00
parent c1e211411b
commit f5deaaba42
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/init.pp
View File

@ -70,6 +70,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.
# Defaults to $facts['os_service_default'].
@ -205,6 +210,7 @@ class manila (
$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'],
@ -272,6 +278,7 @@ class manila (
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 { 'manila_config':

5
releasenotes/notes/enable_cancel_on_failover-69ec2ef2834a1c0f.yaml Normal file
View File

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

1
spec/classes/manila_init_spec.rb
View File

@ -46,6 +46,7 @@ describe 'manila' 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_manila_config('DEFAULT/storage_availability_zone').with(
:value => 'nova'