Merge "Use transient hostname for deployed servers"

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

diff --git a/puppet/services/pacemaker/sahara-engine.yaml b/puppet/services/pacemaker/sahara-engine.yaml
index f6bd8f6..a06d11b 100644 (file)
--- a/puppet/services/pacemaker/sahara-engine.yaml
+++ b/puppet/services/pacemaker/sahara-engine.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Sahara Engine service with Pacemaker 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
@@ -15,6 +24,8 @@ resources:
   SaharaEngineBase:
     type: ../sahara-engine.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
@@ -22,12 +33,13 @@ outputs:
     description: Role data for the Sahara Engine role.
     value:
       service_name: sahara_engine
+      monitoring_subscription: {get_attr: [SaharaEngineBase, role_data, monitoring_subscription]}
+      logging_source: {get_attr: [SaharaEngineBase, role_data, logging_source]}
+      logging_groups: {get_attr: [SaharaEngineBase, role_data, logging_groups]}
       config_settings:
         map_merge:
           - get_attr: [SaharaEngineBase, role_data, config_settings]
           - sahara::service::engine::manage_service: false
             sahara::service::engine::enabled: false
-      # No puppet manifests since sahara-engine is included in
-      # ::tripleo::profile::pacemaker::sahara which is maintained alongside of
-      # pacemaker/sahara-api.yaml.
-      step_config:
+      step_config: |
+        include ::tripleo::profile::pacemaker::sahara::engine