X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fsahara-engine.yaml;h=088411601f5c2a53002280916941fcb16a836b85;hb=404c14e4d6f795d5ba7265a819dccc86a5ecb4e1;hp=cf2651d6f6d4fdb3bff59b2b09aa09281675cb28;hpb=e76d84f784d27a7a2d9e5f3a8b019f8254cb4d6c;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/sahara-engine.yaml b/docker/services/sahara-engine.yaml
index cf2651d6..08841160 100644
--- a/docker/services/sahara-engine.yaml
+++ b/docker/services/sahara-engine.yaml
@@ -15,6 +15,10 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -38,10 +42,14 @@ resources:
   ContainersCommon:
     type: ./containers-common.yaml
 
+  MySQLClient:
+    type: ../../puppet/services/database/mysql-client.yaml
+
   SaharaEnginePuppetBase:
     type: ../../puppet/services/sahara-engine.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
 
@@ -54,8 +62,13 @@ outputs:
         map_merge:
           - get_attr: [SaharaEnginePuppetBase, role_data, config_settings]
           - sahara::sync_db: false
+      logging_source: {get_attr: [SaharaEnginePuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [SaharaEnginePuppetBase, role_data, logging_groups]}
       step_config: &step_config
-        get_attr: [SaharaEnginePuppetBase, role_data, step_config]
+        list_join:
+          - "\n"
+          - - {get_attr: [SaharaEnginePuppetBase, role_data, step_config]}
+            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [SaharaEnginePuppetBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS #
       puppet_config: