openstack/puppet-aodh
Code Issues Proposed changes

Merge "RabbitMQ: Add support for quorum queue options"

Browse Source
This commit is contained in:
Zuul 2023-09-15 16:09:32 +00:00 committed by Gerrit Code Review
commit ea04b9980c
3 changed files with 81 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
manifests/init.pp
View File

@ -66,6 +66,24 @@
# will be run through a green thread. # will be run through a green thread.
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# [*rabbit_quorum_queue*]
# (Optional) Use quorum queues in RabbitMQ.
# Defaults to $facts['os_service_default']
#
# [*rabbit_quorum_delivery_limit*]
# (Optional) Each time a message is rdelivered to a consumer, a counter is
# incremented. Once the redelivery count exceeds the delivery limit
# the message gets dropped or dead-lettered.
# Defaults to $facts['os_service_default']
#
# [*rabbit_quorum_max_memory_length*]
# (Optional) Limit the number of messages in the quorum queue.
# Defaults to $facts['os_service_default']
#
# [*rabbit_quorum_max_memory_bytes*]
# (Optional) Limit the number of memory bytes used by the quorum queue.
# Defaults to $facts['os_service_default']
#
# [*kombu_ssl_ca_certs*] # [*kombu_ssl_ca_certs*]
# (optional) SSL certification authority file (valid only if SSL enabled). # (optional) SSL certification authority file (valid only if SSL enabled).
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
@ -197,6 +215,10 @@ class aodh (
$rabbit_heartbeat_rate = $facts['os_service_default'], $rabbit_heartbeat_rate = $facts['os_service_default'],
$rabbit_heartbeat_in_pthread = $facts['os_service_default'], $rabbit_heartbeat_in_pthread = $facts['os_service_default'],
$rabbit_ha_queues = $facts['os_service_default'], $rabbit_ha_queues = $facts['os_service_default'],
$rabbit_quorum_queue = $facts['os_service_default'],
$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'],
$kombu_ssl_ca_certs = $facts['os_service_default'], $kombu_ssl_ca_certs = $facts['os_service_default'],
$kombu_ssl_certfile = $facts['os_service_default'], $kombu_ssl_certfile = $facts['os_service_default'],
$kombu_ssl_keyfile = $facts['os_service_default'], $kombu_ssl_keyfile = $facts['os_service_default'],
@ -240,19 +262,23 @@ class aodh (
} }
oslo::messaging::rabbit { 'aodh_config': oslo::messaging::rabbit { 'aodh_config':
rabbit_ha_queues => $rabbit_ha_queues, rabbit_ha_queues => $rabbit_ha_queues,
heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold, heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
heartbeat_rate => $rabbit_heartbeat_rate, heartbeat_rate => $rabbit_heartbeat_rate,
heartbeat_in_pthread => $rabbit_heartbeat_in_pthread, heartbeat_in_pthread => $rabbit_heartbeat_in_pthread,
rabbit_use_ssl => $rabbit_use_ssl, rabbit_use_ssl => $rabbit_use_ssl,
kombu_reconnect_delay => $kombu_reconnect_delay, kombu_reconnect_delay => $kombu_reconnect_delay,
kombu_failover_strategy => $kombu_failover_strategy, kombu_failover_strategy => $kombu_failover_strategy,
kombu_ssl_version => $kombu_ssl_version, kombu_ssl_version => $kombu_ssl_version,
kombu_ssl_keyfile => $kombu_ssl_keyfile, kombu_ssl_keyfile => $kombu_ssl_keyfile,
kombu_ssl_certfile => $kombu_ssl_certfile, kombu_ssl_certfile => $kombu_ssl_certfile,
kombu_ssl_ca_certs => $kombu_ssl_ca_certs, kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
kombu_compression => $kombu_compression, kombu_compression => $kombu_compression,
amqp_durable_queues => $amqp_durable_queues, amqp_durable_queues => $amqp_durable_queues,
rabbit_quorum_queue => $rabbit_quorum_queue,
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,
} }
oslo::messaging::amqp { 'aodh_config': oslo::messaging::amqp { 'aodh_config':

4
releasenotes/notes/rabbit-quorum-queue-ce16be662b5e35c6.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
The ``aodh`` class now supports options for quorum queues in RabbitMQ.

64
spec/classes/aodh_init_spec.rb
View File

@ -28,20 +28,24 @@ describe 'aodh' do
:control_exchange => '<SERVICE DEFAULT>' :control_exchange => '<SERVICE DEFAULT>'
) )
is_expected.to contain_oslo__messaging__rabbit('aodh_config').with( is_expected.to contain_oslo__messaging__rabbit('aodh_config').with(
:rabbit_use_ssl => '<SERVICE DEFAULT>', :rabbit_use_ssl => '<SERVICE DEFAULT>',
:heartbeat_timeout_threshold => '<SERVICE DEFAULT>', :heartbeat_timeout_threshold => '<SERVICE DEFAULT>',
:heartbeat_rate => '<SERVICE DEFAULT>', :heartbeat_rate => '<SERVICE DEFAULT>',
:heartbeat_in_pthread => '<SERVICE DEFAULT>', :heartbeat_in_pthread => '<SERVICE DEFAULT>',
:kombu_reconnect_delay => '<SERVICE DEFAULT>', :kombu_reconnect_delay => '<SERVICE DEFAULT>',
:kombu_failover_strategy => '<SERVICE DEFAULT>', :kombu_failover_strategy => '<SERVICE DEFAULT>',
:amqp_durable_queues => '<SERVICE DEFAULT>', :amqp_durable_queues => '<SERVICE DEFAULT>',
:kombu_compression => '<SERVICE DEFAULT>', :kombu_compression => '<SERVICE DEFAULT>',
:kombu_ssl_ca_certs => '<SERVICE DEFAULT>', :kombu_ssl_ca_certs => '<SERVICE DEFAULT>',
:kombu_ssl_certfile => '<SERVICE DEFAULT>', :kombu_ssl_certfile => '<SERVICE DEFAULT>',
:kombu_ssl_keyfile => '<SERVICE DEFAULT>', :kombu_ssl_keyfile => '<SERVICE DEFAULT>',
:kombu_ssl_version => '<SERVICE DEFAULT>', :kombu_ssl_version => '<SERVICE DEFAULT>',
:rabbit_ha_queues => '<SERVICE DEFAULT>', :rabbit_ha_queues => '<SERVICE DEFAULT>',
:rabbit_retry_interval => '<SERVICE DEFAULT>', :rabbit_retry_interval => '<SERVICE DEFAULT>',
:rabbit_quorum_queue => '<SERVICE DEFAULT>',
:rabbit_quorum_delivery_limit => '<SERVICE DEFAULT>',
:rabbit_quorum_max_memory_length => '<SERVICE DEFAULT>',
:rabbit_quorum_max_memory_bytes => '<SERVICE DEFAULT>',
) )
is_expected.to contain_oslo__messaging__amqp('aodh_config').with( is_expected.to contain_oslo__messaging__amqp('aodh_config').with(
:server_request_prefix => '<SERVICE DEFAULT>', :server_request_prefix => '<SERVICE DEFAULT>',
@ -96,6 +100,10 @@ describe 'aodh' do
:kombu_ssl_keyfile => '/etc/key', :kombu_ssl_keyfile => '/etc/key',
:kombu_ssl_version => 'TLSv1', :kombu_ssl_version => 'TLSv1',
:rabbit_ha_queues => true, :rabbit_ha_queues => true,
:rabbit_quorum_queue => true,
:rabbit_quorum_delivery_limit => 3,
:rabbit_quorum_max_memory_length => 5,
:rabbit_quorum_max_memory_bytes => 1073741824,
:amqp_idle_timeout => '60', :amqp_idle_timeout => '60',
:amqp_trace => true, :amqp_trace => true,
:amqp_ssl_ca_file => '/etc/ca.cert', :amqp_ssl_ca_file => '/etc/ca.cert',
@ -119,18 +127,22 @@ describe 'aodh' do
:control_exchange => 'aodh', :control_exchange => 'aodh',
) )
is_expected.to contain_oslo__messaging__rabbit('aodh_config').with( is_expected.to contain_oslo__messaging__rabbit('aodh_config').with(
:rabbit_use_ssl => true, :rabbit_use_ssl => true,
:heartbeat_timeout_threshold => '60', :heartbeat_timeout_threshold => '60',
:heartbeat_rate => '10', :heartbeat_rate => '10',
:heartbeat_in_pthread => true, :heartbeat_in_pthread => true,
:kombu_reconnect_delay => '5.0', :kombu_reconnect_delay => '5.0',
:amqp_durable_queues => true, :amqp_durable_queues => true,
:kombu_compression => 'gzip', :kombu_compression => 'gzip',
:kombu_ssl_ca_certs => '/etc/ca.cert', :kombu_ssl_ca_certs => '/etc/ca.cert',
:kombu_ssl_certfile => '/etc/certfile', :kombu_ssl_certfile => '/etc/certfile',
:kombu_ssl_keyfile => '/etc/key', :kombu_ssl_keyfile => '/etc/key',
:kombu_ssl_version => 'TLSv1', :kombu_ssl_version => 'TLSv1',
:rabbit_ha_queues => true, :rabbit_ha_queues => true,
:rabbit_quorum_queue => true,
:rabbit_quorum_delivery_limit => 3,
:rabbit_quorum_max_memory_length => 5,
:rabbit_quorum_max_memory_bytes => 1073741824,
) )
is_expected.to contain_oslo__messaging__amqp('aodh_config').with( is_expected.to contain_oslo__messaging__amqp('aodh_config').with(
:idle_timeout => '60', :idle_timeout => '60',