X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fzaqar.yaml;h=072c675913c8e4948729a20e0c96376b826955ad;hb=fd1b1f8ec647d56346c0ad3728fed8fbfb482632;hp=df57ad6af00e6e7265113c807ea35f090680f4c7;hpb=951ba92f55f184fd342bc5e7af11113c6b3b10b6;p=apex-tripleo-heat-templates.git diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml index df57ad6a..072c6759 100644 --- a/docker/services/zaqar.yaml +++ b/docker/services/zaqar.yaml @@ -53,6 +53,9 @@ resources: ContainersCommon: type: ./containers-common.yaml + MySQLClient: + type: ../../puppet/services/database/mysql-client.yaml + ZaqarBase: type: ../../puppet/services/zaqar.yaml properties: @@ -71,7 +74,10 @@ outputs: service_name: {get_attr: [ZaqarBase, role_data, service_name]} config_settings: {get_attr: [ZaqarBase, role_data, config_settings]} step_config: &step_config - get_attr: [ZaqarBase, role_data, step_config] + list_join: + - "\n" + - - {get_attr: [ZaqarBase, role_data, step_config]} + - {get_attr: [MySQLClient, role_data, step_config]} service_config_settings: {get_attr: [ZaqarBase, role_data, service_config_settings]} # BEGIN DOCKER SETTINGS puppet_config: