Merge "Changing the default port-binding configuration"

[apex-tripleo-heat-templates.git] / docker / services / mistral-engine.yaml

diff --git a/docker/services/mistral-engine.yaml b/docker/services/mistral-engine.yaml
index 4c6b300..2b498be 100644 (file)
--- a/docker/services/mistral-engine.yaml
+++ b/docker/services/mistral-engine.yaml
@@ -43,6 +43,9 @@ resources:
   ContainersCommon:
     type: ./containers-common.yaml
 
+  MySQLClient:
+    type: ../../puppet/services/database/mysql-client.yaml
+
   MistralBase:
     type: ../../puppet/services/mistral-engine.yaml
     properties:
@@ -62,7 +65,10 @@ outputs:
         map_merge:
           - get_attr: [MistralBase, role_data, config_settings]
       step_config: &step_config
-        get_attr: [MistralBase, role_data, step_config]
+        list_join:
+          - "\n"
+          - - {get_attr: [MistralBase, role_data, step_config]}
+            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config: