openstack
/
cookbook-openstack-telemetry
Code Issues Proposed changes

Enable kombu_ssl_version configuration for Rabbitmq SSL 

Change-Id: I33d85308ea27634d477058cb7548d15fa3d60697
Closes-bug: #1433405
This commit is contained in:
wenchma 2015-03-24 16:18:48 +08:00 committed by Ma Wen Cheng
parent 5feb714c32
commit a0f139ec26
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/common_spec.rb
View File

@ -143,6 +143,17 @@ describe 'openstack-telemetry::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.set['openstack']['mq']['telemetry']['rabbit']['use_ssl'] = true
node.set['openstack']['mq']['telemetry']['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/ceilometer.conf.erb
View File

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