openstack
/
cookbook-openstack-block-storage
Code Issues Proposed changes

Enable kombu_ssl_version configuration for Rabbitmq SSL 

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

Change-Id: Ibadf0770c0b340be60df12431baeb42a5a119c24
Closes-bug: #1433405
This commit is contained in:
wenchma 2015-03-18 14:54:03 +08:00
parent 846bb6779c
commit c11812f7eb
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spec/cinder_common_spec.rb
View File

@ -382,6 +382,17 @@ describe 'openstack-block-storage::cinder-common' do
node.set['openstack']['mq']['block-storage']['rabbit']['vhost'] = 'vhost_value'
expect(chef_run).to render_file(file.name).with_content(/^rabbit_virtual_host=vhost_value$/)
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']['block-storage']['rabbit']['use_ssl'] = true
node.set['openstack']['mq']['block-storage']['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 as mq service' do

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

@ -385,8 +385,10 @@ amqp_auto_delete=<%= node['openstack']['mq']['block-storage']['auto_delete'] %>
######## defined in cinder.openstack.common.rpc.impl_kombu ########
# kombu_ssl_version=
<% if node["openstack"]["mq"]["block-storage"]["rabbit"]["use_ssl"] && node["openstack"]["mq"]["block-storage"]["rabbit"]["kombu_ssl_version"] %>
kombu_ssl_version=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["kombu_ssl_version"] %>
#### (StrOpt) SSL version to use (valid only if SSL enabled)
<% end -%>
# kombu_ssl_keyfile=
#### (StrOpt) SSL key file (valid only if SSL enabled)