aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/nova-api.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-01 20:00:18 +0000
committerGerrit Code Review <review@openstack.org>2017-08-01 20:00:18 +0000
commit56d4563935ce51c54e8a4c38463e6c86dabee889 (patch)
tree2ff3b44f253d50d07683708e048be194e11caf10 /docker/services/nova-api.yaml
parent24349715ca7f05450d2d2da5c29fb76d44fd52aa (diff)
parent0cb45d65c607cf4eb9a4096c7cc3f1c8a5ca58b4 (diff)
Merge "Generate MySQL client config if service requires database"
Diffstat (limited to 'docker/services/nova-api.yaml')
-rw-r--r--docker/services/nova-api.yaml4
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml
index e830ab96..da461049 100644
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@ -42,6 +42,9 @@ resources:
ContainersCommon:
type: ./containers-common.yaml
+ MySQLClient:
+ type: ../../puppet/services/database/mysql-client.yaml
+
NovaApiBase:
type: ../../puppet/services/nova-api.yaml
properties:
@@ -69,6 +72,7 @@ outputs:
- "\n"
- - "['Nova_cell_v2'].each |String $val| { noop_resource($val) }"
- {get_attr: [NovaApiBase, role_data, step_config]}
+ - {get_attr: [MySQLClient, role_data, step_config]}
service_config_settings: {get_attr: [NovaApiBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config: