openstack
/
cookbook-openstack-orchestration
Code Issues Proposed changes

rabbit ha cleanups 

when rabbit ha enabled, add rabbit_ha_queues=True like is done in
the other cookbooks

Change-Id: I1b782d874a547954ebd352beae118b0bb61989b8
Partial-Bug: #1408705
This commit is contained in:
Mark Vanderwiel 2015-01-08 11:04:06 -06:00
parent 210560cc15
commit c4e9d5058d
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -17,6 +17,7 @@ This file is used to list changes made in each version of cookbook-openstack-orc
* Add cert_file, key_file, ca_file and insecure for clients_XXX so that they are configurable.
* Add security arguments for heat-keystone-setup-domain command
* Allow domain id as attribute
* Add rabbit_ha_queues=True when rabbit HA is enabled
## 9.2.0
* python_packages database client attributes have been migrated to

14
spec/spec_helper.rb
View File

@ -314,6 +314,7 @@ shared_examples 'expects to create heat conf' do
/^amqp_auto_delete=false$/,
/^rabbit_host=127.0.0.1$/,
/^rabbit_port=5672$/,
/^rabbit_ha_queues=False$/,
/^rabbit_use_ssl=false$/,
/^rabbit_userid=guest$/,
/^rabbit_password=mq-pass$/,
@ -400,6 +401,19 @@ shared_examples 'expects to create heat conf' do
end
end
end
describe 'has rabbit values' do
it 'has rabbit ha values' do
node.set['openstack']['mq']['orchestration']['service_type'] = 'rabbitmq'
node.set['openstack']['mq']['orchestration']['rabbit']['ha'] = true
[
/^rabbit_hosts=1.1.1.1:5672,2.2.2.2:5672$/,
/^rabbit_ha_queues=True$/
].each do |line|
expect(chef_run).to render_file(file.name).with_content(line)
end
end
end
end
end

17
templates/default/heat.conf.erb
View File

@ -258,9 +258,12 @@ qpid_reconnect_interval=<%= node["openstack"]["mq"]["orchestration"]["qpid"]["re
# RabbitMQ HA cluster host:port pairs (list value)
<% if node["openstack"]["mq"]["orchestration"]["rabbit"]["ha"] -%>
rabbit_hosts=<%= @rabbit_hosts %>
# Use HA queues in RabbitMQ (x-ha-policy: all). If you change
# this option, you must wipe the RabbitMQ database. (boolean
# value)
rabbit_ha_queues=True
<% else -%>
# The RabbitMQ broker address where a single node is used
# (string value)
# The RabbitMQ broker address where a single node is used.
# (string value)
rabbit_host=<%= node["openstack"]["mq"]["orchestration"]["rabbit"]["host"] %>
@ -268,6 +271,11 @@ rabbit_host=<%= node["openstack"]["mq"]["orchestration"]["rabbit"]["host"] %>
# The RabbitMQ broker port where a single node is used.
# (integer value)
rabbit_port=<%= node["openstack"]["mq"]["orchestration"]["rabbit"]["port"] %>
# Use HA queues in RabbitMQ (x-ha-policy: all). If you change
# this option, you must wipe the RabbitMQ database. (boolean
# value)
rabbit_ha_queues=False
<% end -%>
# RabbitMQ HA cluster host:port pairs. (list value)
@ -300,11 +308,6 @@ rabbit_virtual_host=<%= node["openstack"]["mq"]["orchestration"]["rabbit"]["vhos
# (infinite retry count). (integer value)
#rabbit_max_retries=0
# Use HA queues in RabbitMQ (x-ha-policy: all). If you change
# this option, you must wipe the RabbitMQ database. (boolean
# value)
#rabbit_ha_queues=false
# If passed, use a fake RabbitMQ provider. (boolean value)
#fake_rabbit=false
<% end -%>