Merge "Mv Ceilometer settings out of puppet/compute.yaml"

[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 2fd0188..044ca88 100644 (file)
--- a/puppet/services/heat-engine.yaml
+++ b/puppet/services/heat-engine.yaml
@@ -35,11 +35,13 @@ outputs:
   role_data:
     description: Role data for the Heat Engine role.
     value:
-      service_name: heat-engine
+      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::database_connection:
               list_join:
@@ -56,7 +58,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:
               - '%'