openstack/puppet-keystone
Code Issues Proposed changes

Merge "Fixed issue with rabbit_ha_queues parameter"

Browse Source
This commit is contained in:
Jenkins
2016-01-28 20:42:36 +00:00
committed by Gerrit Code Review
parent 41d72f6d12 a88f8e6a7b
commit 49089c3468
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/init.pp
View File

@@ -219,6 +219,10 @@
# (optional) Location of rabbitmq installation. # (optional) Location of rabbitmq installation.
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*rabbit_ha_queues*]
# (Optional) Use HA queues in RabbitMQ.
# Defaults to undef.
#
# [*rabbit_password*] # [*rabbit_password*]
# (optional) Password used to connect to rabbitmq. # (optional) Password used to connect to rabbitmq.
# Defaults to $::os_service_default # Defaults to $::os_service_default
@@ -567,6 +571,7 @@ class keystone(
$rabbit_heartbeat_timeout_threshold = $::os_service_default, $rabbit_heartbeat_timeout_threshold = $::os_service_default,
$rabbit_heartbeat_rate = $::os_service_default, $rabbit_heartbeat_rate = $::os_service_default,
$rabbit_use_ssl = $::os_service_default, $rabbit_use_ssl = $::os_service_default,
$rabbit_ha_queues = undef,
$kombu_ssl_ca_certs = $::os_service_default, $kombu_ssl_ca_certs = $::os_service_default,
$kombu_ssl_certfile = $::os_service_default, $kombu_ssl_certfile = $::os_service_default,
$kombu_ssl_keyfile = $::os_service_default, $kombu_ssl_keyfile = $::os_service_default,
@@ -828,17 +833,25 @@ class keystone(
if ! is_service_default($rabbit_hosts) and $rabbit_hosts { if ! is_service_default($rabbit_hosts) and $rabbit_hosts {
keystone_config { keystone_config {
'oslo_messaging_rabbit/rabbit_hosts': value => join($rabbit_hosts, ','); 'oslo_messaging_rabbit/rabbit_hosts': value => join($rabbit_hosts, ',');
'oslo_messaging_rabbit/rabbit_ha_queues': value => true;
} }
} else { } else {
keystone_config { keystone_config {
'oslo_messaging_rabbit/rabbit_host': value => $rabbit_host; 'oslo_messaging_rabbit/rabbit_host': value => $rabbit_host;
'oslo_messaging_rabbit/rabbit_port': value => $rabbit_port; 'oslo_messaging_rabbit/rabbit_port': value => $rabbit_port;
'oslo_messaging_rabbit/rabbit_ha_queues': value => false;
'oslo_messaging_rabbit/rabbit_hosts': ensure => absent; 'oslo_messaging_rabbit/rabbit_hosts': ensure => absent;
} }
} }
if $rabbit_ha_queues != undef {
keystone_config { 'oslo_messaging_rabbit/rabbit_ha_queues': value => $rabbit_ha_queues }
} else {
if ! is_service_default($rabbit_hosts) and $rabbit_hosts {
keystone_config { 'oslo_messaging_rabbit/rabbit_ha_queues': value => true }
} else {
keystone_config { 'oslo_messaging_rabbit/rabbit_ha_queues': value => false }
}
}
keystone_config { keystone_config {
'oslo_messaging_rabbit/rabbit_use_ssl': value => $rabbit_use_ssl; 'oslo_messaging_rabbit/rabbit_use_ssl': value => $rabbit_use_ssl;
'oslo_messaging_rabbit/rabbit_password': value => $rabbit_password, secret => true; 'oslo_messaging_rabbit/rabbit_password': value => $rabbit_password, secret => true;

10
spec/classes/keystone_spec.rb
View File

@@ -105,6 +105,7 @@ describe 'keystone' do
'rabbit_userid' => 'admin', 'rabbit_userid' => 'admin',
'rabbit_heartbeat_timeout_threshold' => '60', 'rabbit_heartbeat_timeout_threshold' => '60',
'rabbit_heartbeat_rate' => '10', 'rabbit_heartbeat_rate' => '10',
'rabbit_ha_queues' => true,
'default_domain' => 'other_domain', 'default_domain' => 'other_domain',
'using_domain_config' => false 'using_domain_config' => false
} }
@@ -237,6 +238,15 @@ describe 'keystone' do
end end
end end
it 'should ensure rabbit_ha_queues' do
if param_hash['rabbit_ha_queues']
is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value(param_hash['rabbit_ha_queues'])
else
is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value(false)
end
end
if param_hash['default_domain'] if param_hash['default_domain']
it { is_expected.to contain_keystone_domain(param_hash['default_domain']).with(:is_default => true) } it { is_expected.to contain_keystone_domain(param_hash['default_domain']).with(:is_default => true) }
it { is_expected.to contain_anchor('default_domain_created') } it { is_expected.to contain_anchor('default_domain_created') }