x/packstack
Code Issues Proposed changes

Fixes heat missing configuration file

Browse Source 
If the keystone_heat manifest is added to the keystone.pp
manifest it will fail because of missing heat.conf file.
This is due the fact that heat is not installed yet,
this manifest should be appended to the heat.pp manifest to
avoid this error.

For this to work, this puppet-heat patch is needed
https://review.openstack.org/146734

Change-Id: I765cb7fa7bd8d346235fa2c1fc3ca6eea7b9f636
(cherry picked from commit f878e1bc19)
This commit is contained in:
Ivan Chavero
2015-02-02 21:16:46 -07:00
committed by Gael Chamoulaud
parent 98e8444a96
commit c669c34025
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packstack/plugins/heat_650.py
View File

@@ -153,8 +153,6 @@ def initSequences(controller):
steps = [ steps = [
{'title': 'Adding Heat manifest entries', {'title': 'Adding Heat manifest entries',
'functions': [create_manifest]}, 'functions': [create_manifest]},
{'title': 'Adding Heat Keystone manifest entries',
'functions': [create_keystone_manifest]}
] ]
if config.get('CONFIG_HEAT_CLOUDWATCH_INSTALL', 'n') == 'y': if config.get('CONFIG_HEAT_CLOUDWATCH_INSTALL', 'n') == 'y':
@@ -174,6 +172,7 @@ def create_manifest(config, messages):
manifestfile = "%s_heat.pp" % config['CONFIG_CONTROLLER_HOST'] manifestfile = "%s_heat.pp" % config['CONFIG_CONTROLLER_HOST']
manifestdata = getManifestTemplate(get_mq(config, "heat")) manifestdata = getManifestTemplate(get_mq(config, "heat"))
manifestdata += getManifestTemplate("heat") manifestdata += getManifestTemplate("heat")
manifestdata += getManifestTemplate("keystone_heat")
fw_details = dict() fw_details = dict()
key = "heat" key = "heat"
@@ -189,12 +188,6 @@ def create_manifest(config, messages):
appendManifestFile(manifestfile, manifestdata, marker='heat') appendManifestFile(manifestfile, manifestdata, marker='heat')
def create_keystone_manifest(config, messages):
manifestfile = "%s_keystone.pp" % config['CONFIG_CONTROLLER_HOST']
manifestdata = getManifestTemplate("keystone_heat")
appendManifestFile(manifestfile, manifestdata)
def create_cloudwatch_manifest(config, messages): def create_cloudwatch_manifest(config, messages):
manifestfile = "%s_heatcw.pp" % config['CONFIG_CONTROLLER_HOST'] manifestfile = "%s_heatcw.pp" % config['CONFIG_CONTROLLER_HOST']
manifestdata = getManifestTemplate(get_mq(config, "heat")) manifestdata = getManifestTemplate(get_mq(config, "heat"))