X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fpacemaker%2Fheat-engine.yaml;h=54bfdad224504e91899431408f4ed864281ed10f;hb=f6ffad6515beb264d88006a1695651af12978bbe;hp=450917fd97af5ec966a2a345d88d13f12b8723b8;hpb=aa71f16a69f063f9a23377271c7cd17a0c4195cc;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/pacemaker/heat-engine.yaml b/puppet/services/pacemaker/heat-engine.yaml
index 450917fd..54bfdad2 100644
--- a/puppet/services/pacemaker/heat-engine.yaml
+++ b/puppet/services/pacemaker/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
@@ -14,6 +23,8 @@ resources:
   HeatEngineBase:
     type: ../heat-engine.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 
@@ -21,7 +32,10 @@ outputs:
   role_data:
     description: Role data for the Heat engine role.
     value:
-      service_name: heat-engine
+      service_name: heat_engine
+      monitoring_subscription: {get_attr: [HeatEngineBase, role_data, monitoring_subscription]}
+      logging_source: {get_attr: [HeatEngineBase, role_data, logging_source]}
+      logging_groups: {get_attr: [HeatEngineBase, role_data, logging_groups]}
       config_settings:
         map_merge:
           - get_attr: [HeatEngineBase, role_data, config_settings]