openstack
/
cookbook-openstack-orchestration
Code Issues Proposed changes

Fix to configure separate endpoint and bind addresses 

Allow separate endpoint and bind addresses for orchestration.
Update tests.

Change-Id: I216e7973b8114e85928cd69db326e2b52784a7c3
Closes-Bug: #1317646
This commit is contained in:
Mark Vanderwiel 2014-05-08 15:45:19 -05:00
parent c8fa8e1e6b
commit 2524e4a8c1
5 changed files with 15 additions and 6 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.4
* Fix ability to configure separate endpoint and bind addresses
## 9.1.3
* Fix package reference, need keystone client not keystone

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.3'
version '9.1.4'
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'

8
recipes/common.rb
View File

@ -55,8 +55,11 @@ sql_connection = db_uri('orchestration', db_user, db_pass)
identity_endpoint = endpoint 'identity-api'
identity_admin_endpoint = endpoint 'identity-admin'
heat_api_bind = endpoint 'orchestration-api-bind'
heat_api_endpoint = endpoint 'orchestration-api'
heat_api_cfn_bind = endpoint 'orchestration-api-cfn-bind'
heat_api_cfn_endpoint = endpoint 'orchestration-api-cfn'
heat_api_cloudwatch_bind = endpoint 'orchestration-api-cloudwatch-bind'
heat_api_cloudwatch_endpoint = endpoint 'orchestration-api-cloudwatch'
service_pass = get_password 'service', 'openstack-orchestration'
@ -107,8 +110,11 @@ template '/etc/heat/heat.conf' do
service_pass: service_pass,
sql_connection: sql_connection,
heat_api_bind: heat_api_bind,
heat_api_endpoint: heat_api_endpoint,
heat_api_cfn_bind: heat_api_cfn_bind,
heat_api_cloudwatch_bind: heat_api_cloudwatch_bind
heat_api_cfn_endpoint: heat_api_cfn_endpoint,
heat_api_cloudwatch_bind: heat_api_cloudwatch_bind,
heat_api_cloudwatch_endpoint: heat_api_cloudwatch_endpoint
)
end

2
spec/common_spec.rb
View File

@ -90,7 +90,7 @@ describe 'openstack-orchestration::common' do
# TODO: (MRV) Add rest of conf items
[
%r{^heat_metadata_server_url=http://127.0.0.1:8000$},
%r{^heat_waitcondition_server_url=http://127.0.0.1:8000/waitcondition$},
%r{^heat_waitcondition_server_url=http://127.0.0.1:8000/v1/waitcondition$},
%r{^heat_watch_server_url=http://127.0.0.1:8003$}
].each do |content|
it "has a #{content.source[1...-1]} line" do

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

@ -87,13 +87,13 @@ sql_connection=<%= @sql_connection %>
#periodic_interval=60
# URL of the Heat metadata server. (string value)
heat_metadata_server_url=http://<%= @heat_api_cfn_bind.host %>:<%= @heat_api_cfn_bind.port %>
heat_metadata_server_url=http://<%= @heat_api_cfn_endpoint.host %>:<%= @heat_api_cfn_endpoint.port %>
# URL of the Heat waitcondition server. (string value)
heat_waitcondition_server_url=http://<%= @heat_api_cfn_bind.host %>:<%= @heat_api_cfn_bind.port %><%= @heat_api_cfn_bind.path %>/waitcondition
heat_waitcondition_server_url=http://<%= @heat_api_cfn_endpoint.host %>:<%= @heat_api_cfn_endpoint.port %><%= @heat_api_cfn_endpoint.path %>/waitcondition
# URL of the Heat CloudWatch server. (string value)
heat_watch_server_url=http://<%= @heat_api_cloudwatch_bind.host %>:<%= @heat_api_cloudwatch_bind.port %>
heat_watch_server_url=http://<%= @heat_api_cloudwatch_endpoint.host %>:<%= @heat_api_cloudwatch_endpoint.port %>
# Instance connection to CFN/CW API via https. (string value)
#instance_connection_is_secure=0