openstack
/
cookbook-openstack-compute
Code Issues Proposed changes

Enable kombu_ssl_version configuration for Rabbitmq SSL 

This commit depends on https://review.openstack.org/#/c/165302/

Change-Id: I387a62ef545a2bfaa6f294d1b289998245cd91d3
Closes-bug: #1433405
This commit is contained in:
wenchma 2015-03-18 14:25:06 +08:00
parent b030ddb165
commit bc54fdc649
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spec/nova-common_spec.rb
View File

@ -443,6 +443,17 @@ describe 'openstack-compute::nova-common' do
end
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.override['openstack']['mq']['compute']['rabbit']['use_ssl'] = true
node.override['openstack']['mq']['compute']['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
context 'qpid mq backend' do

3
templates/default/nova.conf.erb
View File

@ -40,6 +40,9 @@ amqp_durable_queues=<%= node['openstack']['mq']['compute']['durable_queues'] %>
amqp_auto_delete=<%= node['openstack']['mq']['compute']['auto_delete'] %>
<% if @mq_service_type == "rabbitmq" %>
<% if node["openstack"]["mq"]["compute"]["rabbit"]["use_ssl"] && node["openstack"]["mq"]["compute"]["rabbit"]["kombu_ssl_version"] %>
kombu_ssl_version=<%= node["openstack"]["mq"]["compute"]["rabbit"]["kombu_ssl_version"] %>
<% end -%>
##### RABBITMQ #####
rabbit_userid=<%= node["openstack"]["mq"]["compute"]["rabbit"]["userid"] %>
rabbit_password=<%= @mq_password %>