Set rabbit_use_ssl to a configurable attribute

Add ability to enable rabbit_use_ssl item can be configured,
and not only set false value, so make glance support ssl.

Change-Id: I36ef4676f408d1b40994988a8730ea23cbf3be5e
Closes-Bug: #1358138
This commit is contained in:
wenchma 2014-08-18 15:09:46 +08:00
parent a9cb36f5f3
commit fca5fb5332
4 changed files with 4 additions and 3 deletions

View File

@ -5,6 +5,7 @@ This file is used to list changes made in each version of cookbook-openstack-ima
## 10.0.0
* Upgrading to Juno
* filesystem_store_metadata_file in glance-api.conf configurable with node attribute
* Enable rabbit_use_ssl be configurable
## 9.2.0
* python_packages database client attributes have been migrated to the -common cookbook

View File

@ -14,5 +14,5 @@ recipe 'openstack-image::image_upload', 'Upload image using glance im
supports os
end
depends 'openstack-common', '~> 10.0'
depends 'openstack-common', '~> 10.0.1'
depends 'openstack-identity', '~> 10.0'

View File

@ -203,7 +203,7 @@ describe 'openstack-image::api' do
.and_return('rabbit_password_value')
end
%w(host port userid notification_topic).each do |attr|
%w(host port userid use_ssl notification_topic).each do |attr|
it "sets rabbitmq #{attr} attribute" do
node.set['openstack']['mq']['image']['rabbit'][attr] = "rabbit_#{attr}_value"
expect(chef_run).to render_file(file.name).with_content(/^rabbit_#{attr} = rabbit_#{attr}_value$/)

View File

@ -116,7 +116,7 @@ amqp_auto_delete=<%= node["openstack"]["mq"]["image"]["auto_delete"] %>
transport_url = rabbit://
rabbit_host = <%= node["openstack"]["mq"]["image"]["rabbit"]["host"] %>
rabbit_port = <%= node["openstack"]["mq"]["image"]["rabbit"]["port"] %>
rabbit_use_ssl = false
rabbit_use_ssl = <%= node["openstack"]["mq"]["image"]["rabbit"]["use_ssl"] %>
rabbit_userid = <%= node["openstack"]["mq"]["image"]["rabbit"]["userid"] %>
rabbit_password = <%= @mq_password %>
rabbit_virtual_host = <%= node["openstack"]["mq"]["image"]["rabbit"]["vhost"] %>