Enable kombu_ssl_version configuration for Rabbitmq SSL
Change-Id: I73a8bcf331a72007bb5f27bd166ea97eebd58eeb Closes-bug: #1433405
This commit is contained in:
parent
ded5cad8ee
commit
50573f1d1a
|
@ -82,6 +82,23 @@ describe 'openstack-bare-metal::ironic-common' do
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'rabbit mq backend' do
|
||||
before do
|
||||
node.set['openstack']['mq']['bare-metal']['service_type'] = 'rabbitmq'
|
||||
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']['bare-metal']['rabbit']['use_ssl'] = true
|
||||
node.set['openstack']['mq']['bare-metal']['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
|
||||
|
||||
describe 'rootwrap.conf' do
|
||||
|
|
|
@ -17,6 +17,10 @@ amqp_auto_delete=<%= node['openstack']['mq']['bare-metal']['auto_delete'] %>
|
|||
rpc_conn_pool_size=<%= node['openstack']['bare-metal']['rpc_conn_pool_size'] %>
|
||||
|
||||
<% if @mq_service_type == 'rabbitmq' %>
|
||||
<% if node['openstack']['mq']['bare-metal']['rabbit']['use_ssl'] && node['openstack']['mq']['bare-metal']['rabbit']['kombu_ssl_version'] %>
|
||||
kombu_ssl_version=<%= node['openstack']['mq']['bare-metal']['rabbit']['kombu_ssl_version'] %>
|
||||
<% end -%>
|
||||
|
||||
##### RABBITMQ #####
|
||||
# The RabbitMQ userid. (string value)
|
||||
rabbit_userid=<%= node['openstack']['mq']['bare-metal']['rabbit']['userid'] %>
|
||||
|
|
Loading…
Reference in New Issue