diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-08-01 20:00:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-08-01 20:00:18 +0000 |
| commit | 56d4563935ce51c54e8a4c38463e6c86dabee889 (patch) | |
| tree | 2ff3b44f253d50d07683708e048be194e11caf10 /docker/services/ec2-api.yaml | |
| parent | 24349715ca7f05450d2d2da5c29fb76d44fd52aa (diff) | |
| parent | 0cb45d65c607cf4eb9a4096c7cc3f1c8a5ca58b4 (diff) | |
Merge "Generate MySQL client config if service requires database"
Diffstat (limited to 'docker/services/ec2-api.yaml')
| -rw-r--r-- | docker/services/ec2-api.yaml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/docker/services/ec2-api.yaml b/docker/services/ec2-api.yaml index 9f1ecbc1..1d4ddd38 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: @@ -58,7 +61,10 @@ outputs: service_name: {get_attr: [Ec2ApiPuppetBase, role_data, service_name]} config_settings: {get_attr: [Ec2ApiPuppetBase, role_data, config_settings]} 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: |