From e1f24067a975c544d41b891182a1ab6d12ca204a Mon Sep 17 00:00:00 2001 From: Mark Vanderwiel Date: Tue, 27 May 2014 15:45:57 -0500 Subject: [PATCH] Fix to properly set [keystone_authtoken] signing_dir Attribute already existed and directory resource was created, but the value was not set the heat.conf. Change-Id: I0b952f6542d69bdae712ad79976f9c7fb07c1c6c Closes-Bug: #1323833 --- CHANGELOG.md | 3 +++ metadata.rb | 2 +- spec/common_spec.rb | 3 ++- templates/default/heat.conf.erb | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f960ea..5245833 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # CHANGELOG for cookbook-openstack-orchestration This file is used to list changes made in each version of cookbook-openstack-orchestration +## 9.1.5 +* Fix to properly set signing_dir + ## 9.1.4 * Fix ability to configure separate endpoint and bind addresses diff --git a/metadata.rb b/metadata.rb index d18be3b..2f943b0 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ maintainer 'IBM, Inc.' license 'Apache 2.0' description 'Installs and configures the Heat Service' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '9.1.4' +version '9.1.5' recipe 'openstack-orchestration::api', 'Start and configure the Heat API service' recipe 'openstack-orchestration::api-cfn', 'Start and configure the Heat API CloudFormation service' recipe 'openstack-orchestration::api-cloudwatch', 'Start and configure the Heat API CloudWatch service' diff --git a/spec/common_spec.rb b/spec/common_spec.rb index affabeb..106110b 100755 --- a/spec/common_spec.rb +++ b/spec/common_spec.rb @@ -91,7 +91,8 @@ describe 'openstack-orchestration::common' do [ %r{^heat_metadata_server_url=http://127.0.0.1:8000$}, %r{^heat_waitcondition_server_url=http://127.0.0.1:8000/v1/waitcondition$}, - %r{^heat_watch_server_url=http://127.0.0.1:8003$} + %r{^heat_watch_server_url=http://127.0.0.1:8003$}, + %r{^signing_dir=/var/cache/heat$} ].each do |content| it "has a #{content.source[1...-1]} line" do expect(@chef_run).to render_file(@template.name).with_content(content) diff --git a/templates/default/heat.conf.erb b/templates/default/heat.conf.erb index a30b703..7957fa3 100755 --- a/templates/default/heat.conf.erb +++ b/templates/default/heat.conf.erb @@ -1094,7 +1094,7 @@ admin_tenant_name=<%= node["openstack"]["orchestration"]["service_tenant_name"] # Directory used to cache files related to PKI tokens (string # value) -#signing_dir= +signing_dir=<%= node['openstack']['orchestration']['api']['auth']['cache_dir'] %> # Optionally specify a list of memcached server(s) to use for # caching. If left undefined, tokens will instead be cached