openstack
/
cookbook-openstack-orchestration
Code Issues Proposed changes

Enable kombu_ssl_version configuration for Rabbitmq SSL 

Change-Id: I29bdaa7d68b2e3feb41c2debfda44e9ee2466aa8
Closes-bug: #1433405
This commit is contained in:
wenchma 2015-03-24 16:10:12 +08:00 committed by Ma Wen Cheng
parent b556cfa8b1
commit 337ca2d4b4
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spec/spec_helper.rb
View File

@ -405,8 +405,11 @@ shared_examples 'expects to create heat conf' do
end
describe 'has rabbit values' do
it 'has rabbit ha values' do
before do
node.set['openstack']['mq']['orchestration']['service_type'] = 'rabbitmq'
end
it 'has rabbit ha values' do
node.set['openstack']['mq']['orchestration']['rabbit']['ha'] = true
[
/^rabbit_hosts=1.1.1.1:5672,2.2.2.2:5672$/,
@ -415,6 +418,17 @@ shared_examples 'expects to create heat conf' do
expect(chef_run).to render_file(file.name).with_content(line)
end
end
it 'does not have kombu ssl version set' do
expect(chef_run).not_to render_config_file(file.name).with_section_content('DEFAULT', /^kombu_ssl_version=TLSv1.2$/)
end
it 'sets kombu ssl version' do
node.set['openstack']['mq']['orchestration']['rabbit']['use_ssl'] = true
node.set['openstack']['mq']['orchestration']['rabbit']['kombu_ssl_version'] = 'TLSv1.2'
expect(chef_run).to render_config_file(file.name).with_section_content('DEFAULT', /^kombu_ssl_version=TLSv1.2$/)
end
end
end
end

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

@ -258,6 +258,10 @@ qpid_reconnect_interval=<%= node["openstack"]["mq"]["orchestration"]["qpid"]["re
<% if @mq_service_type == "rabbitmq" %>
<% if node["openstack"]["mq"]["orchestration"]["rabbit"]["use_ssl"] && node["openstack"]["mq"]["orchestration"]["rabbit"]["kombu_ssl_version"] %>
kombu_ssl_version=<%= node["openstack"]["mq"]["orchestration"]["rabbit"]["kombu_ssl_version"] %>
<% end -%>
# RabbitMQ HA cluster host:port pairs (list value)
<% if node["openstack"]["mq"]["orchestration"]["rabbit"]["ha"] -%>
rabbit_hosts=<%= @rabbit_hosts %>