Add a rabbit_transient_queues_ttl and amqp_auto_delete params
The amqp_auto_delete option needs this patch: https://review.opendev.org/c/openstack/puppet-oslo/+/944132 Since transient_queues_ttl is also managed by oslo::messaging::rabbit, there's no way to use ceilometer_config to set it, so this patch is mandatory for one to set rabbit_transient_queues_ttl in ceilometer.conf. Change-Id: I72e08e90e55afab4a76c9b80365164af5c54b14c
This commit is contained in:
@@ -74,6 +74,14 @@
|
||||
# (Optional) Use quorum queues for transients queues in RabbitMQ.
|
||||
# Defaults to $facts['os_service_default']
|
||||
#
|
||||
# [*rabbit_transient_queues_ttl*]
|
||||
# (Optional) Positive integer representing duration in seconds for
|
||||
# queue TTL (x-expires). Queues which are unused for the duration
|
||||
# of the TTL are automatically deleted.
|
||||
# The parameter affects only reply and fanout queues. (integer value)
|
||||
# Min to 1
|
||||
# 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
|
||||
@@ -112,6 +120,10 @@
|
||||
# (Optional) Connect over SSL for RabbitMQ. (boolean value)
|
||||
# Defaults to $facts['os_service_default']
|
||||
#
|
||||
# [*amqp_auto_delete*]
|
||||
# (Optional) Define if transient queues should be auto-deleted (boolean value)
|
||||
# Defaults to $facts['os_service_default']
|
||||
#
|
||||
# [*amqp_durable_queues*]
|
||||
# (optional) Define queues as "durable" to rabbitmq.
|
||||
# Defaults to $facts['os_service_default']
|
||||
@@ -190,6 +202,7 @@ class ceilometer(
|
||||
$rabbit_ha_queues = $facts['os_service_default'],
|
||||
$rabbit_quorum_queue = $facts['os_service_default'],
|
||||
$rabbit_transient_quorum_queue = $facts['os_service_default'],
|
||||
$rabbit_transient_queues_ttl = $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'],
|
||||
@@ -198,6 +211,7 @@ class ceilometer(
|
||||
$rabbit_heartbeat_rate = $facts['os_service_default'],
|
||||
$rabbit_qos_prefetch_count = $facts['os_service_default'],
|
||||
$amqp_durable_queues = $facts['os_service_default'],
|
||||
$amqp_auto_delete = $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'],
|
||||
@@ -232,6 +246,7 @@ class ceilometer(
|
||||
heartbeat_in_pthread => $rabbit_heartbeat_in_pthread,
|
||||
rabbit_qos_prefetch_count => $rabbit_qos_prefetch_count,
|
||||
amqp_durable_queues => $amqp_durable_queues,
|
||||
amqp_auto_delete => $amqp_auto_delete,
|
||||
rabbit_use_ssl => $rabbit_use_ssl,
|
||||
kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
|
||||
kombu_ssl_certfile => $kombu_ssl_certfile,
|
||||
@@ -242,6 +257,7 @@ class ceilometer(
|
||||
kombu_compression => $kombu_compression,
|
||||
rabbit_quorum_queue => $rabbit_quorum_queue,
|
||||
rabbit_transient_quorum_queue => $rabbit_transient_quorum_queue,
|
||||
rabbit_transient_queues_ttl => $rabbit_transient_queues_ttl,
|
||||
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,
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
Add a new ``amqp_auto_delete`` parameter, so that transient queues are
|
||||
automatically deleted.
|
||||
@@ -0,0 +1,6 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
A new parameter ``rabbit_transient_queues_ttl`` has been added to the
|
||||
ceilometer init class to configure how long transtient queue should stay until
|
||||
they are automatically deleted.
|
||||
@@ -150,11 +150,13 @@ describe 'ceilometer' do
|
||||
:heartbeat_in_pthread => nil,
|
||||
:rabbit_qos_prefetch_count => '<SERVICE DEFAULT>',
|
||||
:amqp_durable_queues => '<SERVICE DEFAULT>',
|
||||
:amqp_auto_delete => '<SERVICE DEFAULT>',
|
||||
:kombu_reconnect_delay => '<SERVICE DEFAULT>',
|
||||
:kombu_failover_strategy => '<SERVICE DEFAULT>',
|
||||
:kombu_compression => '<SERVICE DEFAULT>',
|
||||
:rabbit_quorum_queue => '<SERVICE DEFAULT>',
|
||||
:rabbit_transient_quorum_queue => '<SERVICE DEFAULT>',
|
||||
:rabbit_transient_queues_ttl => '<SERVICE DEFAULT>',
|
||||
:rabbit_quorum_delivery_limit => '<SERVICE DEFAULT>',
|
||||
:rabbit_quorum_max_memory_length => '<SERVICE DEFAULT>',
|
||||
:rabbit_quorum_max_memory_bytes => '<SERVICE DEFAULT>',
|
||||
|
||||
Reference in New Issue
Block a user