diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d11549..a19812d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/metadata.rb b/metadata.rb index a102c37..34cc9b8 100644 --- a/metadata.rb +++ b/metadata.rb @@ -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' diff --git a/spec/api_spec.rb b/spec/api_spec.rb index 46f442a..7cf91f7 100644 --- a/spec/api_spec.rb +++ b/spec/api_spec.rb @@ -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$/) diff --git a/templates/default/glance-api.conf.erb b/templates/default/glance-api.conf.erb index 9354319..c2456f6 100644 --- a/templates/default/glance-api.conf.erb +++ b/templates/default/glance-api.conf.erb @@ -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"] %>