openstack
/
puppet-designate
Code Issues Proposed changes

Merge "Add amqp_durable_queues parameter"

This commit is contained in:
Jenkins 2017-09-20 08:04:41 +00:00 committed by Gerrit Code Review
parent 3f069cd0f4 36a58315b1
commit b3a3f31fc8
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/init.pp
View File

@ -108,6 +108,10 @@
# in the designate config.
# Defaults to false
#
# [*amqp_durable_queues*]
# (optional) Whether to use durable queues in AMQP.
# Defaults to $::os_service_default.
#
# DEPRECATED PARAMETER
#
# [*rabbit_virtualhost*]
@ -167,6 +171,7 @@ class designate(
$control_exchange = $::os_service_default,
$notification_topics = 'notifications',
$purge_config = false,
$amqp_durable_queues = $::os_service_default,
#DEPRECATED PARAMETER
$rabbit_virtualhost = undef,
$rabbit_host = $::os_service_default,
@ -258,6 +263,7 @@ to your desired configuration.")
rabbit_password => $rabbit_password,
rabbit_virtual_host => $rabbit_virtual_host,
rabbit_ha_queues => $rabbit_ha_queues_real,
amqp_durable_queues => $amqp_durable_queues,
}
oslo::messaging::default { 'designate_config':

4
releasenotes/notes/add_amqp_durable_queues-bc6e32cab4574428.yaml Normal file
View File

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

5
spec/classes/designate_init_spec.rb
View File

@ -19,7 +19,8 @@ describe 'designate' do
:rabbit_hosts => [ '10.0.0.1:5672', '10.0.0.2:5672', '10.0.0.3:5672' ],
:rabbit_userid => 'guest',
:rabbit_password => '',
:rabbit_virtual_host => '/'
:rabbit_virtual_host => '/',
:amqp_durable_queues => true
}
end
@ -159,6 +160,7 @@ describe 'designate' do
it { is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_hosts').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_port').with_value( params[:rabbit_port] ) }
it { is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value( 'false' ) }
it { is_expected.to contain_designate_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('<SERVICE DEFAULT>') }
end
@ -176,6 +178,7 @@ describe 'designate' do
it { is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_hosts').with_value( '10.0.0.1:5672,10.0.0.2:5672,10.0.0.3:5672' ) }
it { is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_port').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value( 'true' ) }
it { is_expected.to contain_designate_config('oslo_messaging_rabbit/amqp_durable_queues').with_value( 'true' ) }
end