X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fheat-engine.yaml;h=fba80c5d58cea44b1a0ebe85ef691b3d1fb71ed2;hb=3b62761d2fc25abef4ca98e9d5863197c4497b85;hp=143d24bb087b3f05a0b637d27e2fa45c8b87e12c;hpb=083ec30c8c0838f60d2398d464fa8409ddb329ed;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/heat-engine.yaml b/puppet/services/heat-engine.yaml
index 143d24bb..fba80c5d 100644
--- a/puppet/services/heat-engine.yaml
+++ b/puppet/services/heat-engine.yaml
@@ -4,14 +4,20 @@ 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
                  via parameter_defaults in the resource registry.
     type: json
-  MysqlVirtualIPUri:
-    type: string
-    default: ''
   HeatEnableDBPurge:
     type: boolean
     default: true
@@ -33,30 +39,42 @@ parameters:
 resources:
   HeatBase:
     type: ./heat-base.yaml
+    properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
+      EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Heat Engine role.
     value:
+      service_name: heat_engine
       config_settings:
         map_merge:
           - get_attr: [HeatBase, role_data, config_settings]
           - heat::engine::num_engine_workers: {get_param: HeatWorkers}
+            heat::engine::configure_delegated_roles: false
+            heat::engine::trusts_delegated_roles: []
             tripleo::profile::base::heat::manage_db_purge: {get_param: HeatEnableDBPurge}
-            heat_dsn: &heat_dsn
+            heat::database_connection:
               list_join:
                 - ''
-                - - 'mysql+pymysql://heat:'
+                - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+                  - '://heat:'
                   - {get_param: HeatPassword}
                   - '@'
-                  - {get_param: MysqlVirtualIPUri}
+                  - {get_param: [EndpointMap, MysqlInternal, host]}
                   - '/heat'
-            heat::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
             heat::keystone_ec2_uri: {get_param: [EndpointMap, KeystoneEC2, uri]}
             heat::identity_uri: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
             heat::keystone_password: {get_param: HeatPassword}
-            heat::database_connection: *heat_dsn
             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, MysqlInternal, host_nobrackets]}
+            heat::db::mysql::dbname: heat
+            heat::db::mysql::allowed_hosts:
+              - '%'
+              - "%{hiera('mysql_bind_host')}"
       step_config: |
         include ::tripleo::profile::base::heat::engine