X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fec2-api.yaml;h=48f1da4bdad48c9a357220d375c4eaf0aa7957fd;hb=af040d1e9418e6f266cfe8e2d1111ac80aaa7b94;hp=9f1ecbc11621ea730535e7eae418dcc76a667555;hpb=7e4f7dd2b0324247bba8fd8da5f3becd20e8299f;p=apex-tripleo-heat-templates.git diff --git a/docker/services/ec2-api.yaml b/docker/services/ec2-api.yaml index 9f1ecbc1..48f1da4b 100644 --- a/docker/services/ec2-api.yaml +++ b/docker/services/ec2-api.yaml @@ -42,6 +42,9 @@ resources: ContainersCommon: type: ./containers-common.yaml + MySQLClient: + type: ../../puppet/services/database/mysql-client.yaml + Ec2ApiPuppetBase: type: ../../puppet/services/ec2-api.yaml properties: @@ -57,8 +60,13 @@ outputs: value: service_name: {get_attr: [Ec2ApiPuppetBase, role_data, service_name]} config_settings: {get_attr: [Ec2ApiPuppetBase, role_data, config_settings]} + logging_source: {get_attr: [Ec2ApiPuppetBase, role_data, logging_source]} + logging_groups: {get_attr: [Ec2ApiPuppetBase, role_data, logging_groups]} step_config: &step_config - get_attr: [Ec2ApiPuppetBase, role_data, step_config] + list_join: + - "\n" + - - {get_attr: [Ec2ApiPuppetBase, role_data, step_config]} + - {get_attr: [MySQLClient, role_data, step_config]} service_config_settings: {get_attr: [Ec2ApiPuppetBase, role_data, service_config_settings]} # BEGIN DOCKER SETTINGS puppet_config: