Merge "M/N upgrade set scheduler_host_manager right."

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

diff --git a/puppet/services/pacemaker/heat-engine.yaml b/puppet/services/pacemaker/heat-engine.yaml
index a8ed5c0..579f5f1 100644 (file)
--- 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,6 +32,7 @@ outputs:
   role_data:
     description: Role data for the Heat engine role.
     value:
+      service_name: heat_engine
       config_settings:
         map_merge:
           - get_attr: [HeatEngineBase, role_data, config_settings]