add oslo_messaging_rabbit/amqp_durable_queues option

Change-Id: Ib541a3db459cb1725996acffdbe07dc452376060
This commit is contained in:
Jake Yip 2018-07-12 14:57:10 +10:00
parent 6f4e356d38
commit 86e943c3ca
3 changed files with 13 additions and 0 deletions

View File

@ -91,6 +91,10 @@
# in the magnum config.
# Defaults to false.
#
# [*amqp_durable_queues*]
# (optional) Whether to use durable queues in AMQP.
# Defaults to $::os_service_default.
#
class magnum(
$package_ensure = 'present',
$notification_transport_url = $::os_service_default,
@ -109,6 +113,7 @@ class magnum(
$kombu_ssl_version = $::os_service_default,
$kombu_failover_strategy = $::os_service_default,
$purge_config = false,
$amqp_durable_queues = $::os_service_default,
) {
include ::magnum::deps
@ -137,6 +142,7 @@ class magnum(
kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
kombu_failover_strategy => $kombu_failover_strategy,
rabbit_ha_queues => $rabbit_ha_queues,
amqp_durable_queues => $amqp_durable_queues,
}
oslo::messaging::default { 'magnum_config':

View File

@ -0,0 +1,4 @@
---
features:
- Add new parameter "amqp_durable_queues", to indicate whether to use
durable queues in AMQP

View File

@ -39,6 +39,7 @@ describe 'magnum' do
is_expected.to contain_magnum_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('<SERVICE DEFAULT>')
is_expected.to contain_magnum_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('<SERVICE DEFAULT>')
is_expected.to contain_magnum_config('oslo_messaging_rabbit/heartbeat_rate').with_value('<SERVICE DEFAULT>')
is_expected.to contain_magnum_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('<SERVICE DEFAULT>')
end
it 'configures various things' do
@ -62,6 +63,7 @@ describe 'magnum' do
:rabbit_ha_queues => true,
:rabbit_heartbeat_timeout_threshold => 60,
:rabbit_heartbeat_rate => 10,
:amqp_durable_queues => true,
}
end
@ -81,6 +83,7 @@ describe 'magnum' do
is_expected.to contain_magnum_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value(true)
is_expected.to contain_magnum_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value(60)
is_expected.to contain_magnum_config('oslo_messaging_rabbit/heartbeat_rate').with_value(10)
is_expected.to contain_magnum_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(true)
end
it 'configures various things' do