rabbit ha cleanups

Add global flag for enabling rabbit ha
node['openstack']['mq']['rabbitmq']['ha'] = true

Change-Id: Iaaea0857d145c1f6cdb82eee6453a50083d9c331
Partial-Bug: #1408705
This commit is contained in:
Mark Vanderwiel 2015-01-08 11:40:12 -06:00
parent d99aacda7c
commit e7a62853a3
3 changed files with 11 additions and 1 deletions

View File

@ -12,6 +12,7 @@ This file is used to list changes made in each version of cookbook-openstack-com
* Removed the hardcoded PPA reference to "Precise"
* Added an optional automatic apt-get update for Debian based repos
* Add a new custom matcher render_config_file to test ini file content
* Add global rabbit ha flag
## 10.1.0
* Adding identity admin bind host endpoint to allow flexibility and consistency

View File

@ -53,7 +53,10 @@ default['openstack']['mq']['auto_delete'] = false
# Default qpid and rabbit values (for attribute assignment below)
###################################################################
default['openstack']['mq']['qpid']['protocol'] = 'tcp'
# global switch for handling rabbit ssl
default['openstack']['mq']['rabbitmq']['use_ssl'] = false
# global switch for handling rabbit ha
default['openstack']['mq']['rabbitmq']['ha'] = false
# defined in oslo/messaging/_drivers/impl_qpid.py
default['openstack']['mq']['qpid']['topology_version'] = 1
qpid_defaults = {
@ -79,7 +82,7 @@ rabbit_defaults = {
vhost: node['openstack']['mq']['vhost'],
port: node['openstack']['endpoints']['mq']['port'],
host: node['openstack']['endpoints']['mq']['host'],
ha: false,
ha: node['openstack']['mq']['rabbitmq']['ha'],
use_ssl: node['openstack']['mq']['rabbitmq']['use_ssl']
}

View File

@ -50,5 +50,11 @@ describe 'openstack-common::default' do
.with(version: '~> 2.3')
end
it 'enables rabbit ha for all services' do
node.set['openstack']['mq']['rabbitmq']['ha'] = true
%w{block-storage compute database image telemetry network orchestration}.each do |svc|
expect(chef_run.node['openstack']['mq'][svc]['rabbit']['ha']).to eq(true)
end
end
end
end