summaryrefslogtreecommitdiffstats
path: root/docker/services/mistral-executor.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'docker/services/mistral-executor.yaml')
-rw-r--r--docker/services/mistral-executor.yaml8
1 files changed, 7 insertions, 1 deletions
diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml
index ea54c574..e106fe47 100644
--- a/docker/services/mistral-executor.yaml
+++ b/docker/services/mistral-executor.yaml
@@ -43,6 +43,9 @@ resources:
ContainersCommon:
type: ./containers-common.yaml
+ MySQLClient:
+ type: ../../puppet/services/database/mysql-client.yaml
+
MistralBase:
type: ../../puppet/services/mistral-executor.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: