rabbit ha cleanups
allow rabbit ssl to be enabled when ha is used. Change-Id: I2c1ca78e255d7288bb30925fd9dd9cde9ff08e9a Partial-Bug: # 1408705
This commit is contained in:
parent
b4d15bf701
commit
e19da7ee1e
|
@ -20,6 +20,7 @@ This file is used to list changes made in each version of cookbook-openstack-com
|
|||
* Update and remove the outdated options
|
||||
* Add cinder_catalog_info
|
||||
* Updated the nova-networking to start metadata-api
|
||||
* Allow rabbit ssl in the ha case
|
||||
|
||||
## 9.3.1
|
||||
* Move auth configuration from api-paste.ini to nova.conf
|
||||
|
|
|
@ -361,7 +361,8 @@ describe 'openstack-compute::nova-common' do
|
|||
it 'sets ha rabbit options correctly' do
|
||||
[
|
||||
/^rabbit_hosts=1.1.1.1:5672,2.2.2.2:5672$/,
|
||||
/^rabbit_ha_queues=True$/
|
||||
/^rabbit_ha_queues=True$/,
|
||||
/^rabbit_use_ssl=false$/
|
||||
].each do |line|
|
||||
expect(chef_run).to render_file(file.name).with_content(line)
|
||||
end
|
||||
|
|
|
@ -47,6 +47,7 @@ rabbit_virtual_host=<%= node["openstack"]["mq"]["compute"]["rabbit"]["vhost"] %>
|
|||
<% if node["openstack"]["mq"]["compute"]["rabbit"]["ha"] -%>
|
||||
rabbit_hosts=<%= @rabbit_hosts %>
|
||||
rabbit_ha_queues=True
|
||||
rabbit_use_ssl=<%= node["openstack"]["mq"]["compute"]["rabbit"]["use_ssl"] %>
|
||||
<% else -%>
|
||||
rabbit_host=<%= node["openstack"]["mq"]["compute"]["rabbit"]["host"] %>
|
||||
rabbit_port=<%= node["openstack"]["mq"]["compute"]["rabbit"]["port"] %>
|
||||
|
|
Loading…
Reference in New Issue