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 1e39b36..579f5f1 100644 (file)
--- a/puppet/services/pacemaker/heat-engine.yaml
+++ b/puppet/services/pacemaker/heat-engine.yaml
@@ -4,33 +4,39 @@ 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: ''
 
 resources:
   HeatEngineBase:
     type: ../heat-engine.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
-      MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri}
 
 
 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]
           - heat::engine::manage_service: false
             heat::engine::enabled: false
-      step_config:
-        # No puppet manifests since heat-engine is included in
-        # ::tripleo::profile::pacemaker::heat which is maintained alongside of
-        # pacemaker/heat-api.yaml.
+      step_config: |
+        include ::tripleo::profile::pacemaker::heat::engine