Merge "Adding optional aci-opflex hiera data"

[apex-tripleo-heat-templates.git] / puppet / services / heat-engine.yaml

diff --git a/puppet/services/heat-engine.yaml b/puppet/services/heat-engine.yaml
index 13555a6..fba80c5 100644 (file)
--- a/puppet/services/heat-engine.yaml
+++ b/puppet/services/heat-engine.yaml
@@ -4,6 +4,15 @@ description: >
   Openstack Heat Engine service configured with Puppet
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -30,6 +39,10 @@ parameters:
 resources:
   HeatBase:
     type: ./heat-base.yaml
+    properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
+      EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
@@ -58,7 +71,7 @@ outputs:
             heat::db::mysql::password: {get_param: HeatPassword}
             heat::keystone::domain::domain_password: {get_param: HeatStackDomainAdminPassword}
             heat::db::mysql::user: heat
-            heat::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
+            heat::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
             heat::db::mysql::dbname: heat
             heat::db::mysql::allowed_hosts:
               - '%'