diff --git a/manifests/init.pp b/manifests/init.pp index c30c8bc83..214f8a1c3 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -179,6 +179,12 @@ # (optional) Connect over SSL for RabbitMQ # Defaults to $::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. +# Defaults to $::os_service_default +# # [*amqp_durable_queues*] # (optional) Define queues as "durable" to rabbitmq. # Defaults to $::os_service_default @@ -415,6 +421,7 @@ class neutron ( $rabbit_heartbeat_timeout_threshold = $::os_service_default, $rabbit_heartbeat_rate = $::os_service_default, $rabbit_use_ssl = $::os_service_default, + $rabbit_transient_queues_ttl = $::os_service_default, $amqp_durable_queues = $::os_service_default, $kombu_ssl_ca_certs = $::os_service_default, $kombu_ssl_certfile = $::os_service_default, @@ -585,6 +592,7 @@ class neutron ( heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold, heartbeat_rate => $rabbit_heartbeat_rate, rabbit_use_ssl => $rabbit_use_ssl, + rabbit_transient_queues_ttl => $rabbit_transient_queues_ttl, kombu_reconnect_delay => $kombu_reconnect_delay, kombu_missing_consumer_retry_timeout => $kombu_missing_consumer_retry_timeout, kombu_failover_strategy => $kombu_failover_strategy, diff --git a/releasenotes/notes/added-rabbit_transient_queues_ttl-option-3a0926100bd05b01.yaml b/releasenotes/notes/added-rabbit_transient_queues_ttl-option-3a0926100bd05b01.yaml new file mode 100644 index 000000000..1581b72e9 --- /dev/null +++ b/releasenotes/notes/added-rabbit_transient_queues_ttl-option-3a0926100bd05b01.yaml @@ -0,0 +1,3 @@ +--- +features: + - Add oslo.messaging rabbit_transient_queues_ttl parameter support. diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb index fcaa8b513..bc8e74c8d 100644 --- a/spec/classes/neutron_init_spec.rb +++ b/spec/classes/neutron_init_spec.rb @@ -69,6 +69,12 @@ describe 'neutron' do it_configures 'rabbit with durable queues' end + context 'with rabbitmq non default transient_queues_ttl' do + before { params.merge!( :rabbit_transient_queues_ttl => 20 ) } + it_configures 'rabbit with non default transient_queues_ttl' + end + + it_configures 'with SSL enabled with kombu' it_configures 'with SSL enabled without kombu' it_configures 'with SSL disabled' @@ -190,6 +196,12 @@ describe 'neutron' do end end + shared_examples_for 'rabbit with non default transient_queues_ttl' do + it 'in neutron.conf' do + is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_transient_queues_ttl').with_value(20) + end + end + shared_examples_for 'rabbit_ha_queues set to false' do it 'in neutron.conf' do is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value(false)