openstack
/
cookbook-openstack-orchestration
Code Issues Proposed changes

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
This commit is contained in:
Mark Vanderwiel 2014-05-27 15:45:57 -05:00
parent e67e8ad3dd
commit e1f24067a9
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -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

2
metadata.rb
View File

@ -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'

3
spec/common_spec.rb
View File

@ -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)

2
templates/default/heat.conf.erb
View File

@ -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=<None>
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