Fixes heat missing configuration file

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)

packstack/plugins/heat_650.py

@@ -153,8 +153,6 @@ def initSequences(controller):
     steps = [
         {'title': 'Adding Heat manifest entries',
          'functions': [create_manifest]},
-        {'title': 'Adding Heat Keystone manifest entries',
-         'functions': [create_keystone_manifest]}
     ]
 
     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']
     manifestdata = getManifestTemplate(get_mq(config, "heat"))
     manifestdata += getManifestTemplate("heat")
+    manifestdata += getManifestTemplate("keystone_heat")
 
     fw_details = dict()
     key = "heat"
@@ -189,12 +188,6 @@ def create_manifest(config, messages):
     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):
     manifestfile = "%s_heatcw.pp" % config['CONFIG_CONTROLLER_HOST']
     manifestdata = getManifestTemplate(get_mq(config, "heat"))