X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fmistral-engine.yaml;h=12f7779b20a099e66b0ac048448b1eb9abbe9781;hb=0e5347ad7f160743aead7dd8dded91fb7d72c3ff;hp=4c6b300d9f6d3cfdb3a07c3e6e8289f7c3150f9c;hpb=c57543bba2626d92d8f868af68df04ef97cc1088;p=apex-tripleo-heat-templates.git diff --git a/docker/services/mistral-engine.yaml b/docker/services/mistral-engine.yaml index 4c6b300d..12f7779b 100644 --- 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: @@ -61,8 +64,13 @@ outputs: config_settings: map_merge: - get_attr: [MistralBase, role_data, config_settings] + logging_source: {get_attr: [MistralBase, role_data, logging_source]} + logging_groups: {get_attr: [MistralBase, role_data, logging_groups]} 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: