aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/nova-placement.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-placement.yaml
parent24349715ca7f05450d2d2da5c29fb76d44fd52aa (diff)
parent0cb45d65c607cf4eb9a4096c7cc3f1c8a5ca58b4 (diff)
Merge "Generate MySQL client config if service requires database"
Diffstat (limited to 'docker/services/nova-placement.yaml')
-rw-r--r--docker/services/nova-placement.yaml8
1 files changed, 7 insertions, 1 deletions
diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml
index 4c8fafd0..d784ace3 100644
--- a/docker/services/nova-placement.yaml
+++ b/docker/services/nova-placement.yaml
@@ -42,6 +42,9 @@ resources:
ContainersCommon:
type: ./containers-common.yaml
+ MySQLClient:
+ type: ../../puppet/services/database/mysql-client.yaml
+
NovaPlacementBase:
type: ../../puppet/services/nova-placement.yaml
properties:
@@ -62,7 +65,10 @@ outputs:
- get_attr: [NovaPlacementBase, role_data, config_settings]
- apache::default_vhost: false
step_config: &step_config
- get_attr: [NovaPlacementBase, role_data, step_config]
+ list_join:
+ - "\n"
+ - - {get_attr: [NovaPlacementBase, role_data, step_config]}
+ - {get_attr: [MySQLClient, role_data, step_config]}
service_config_settings: {get_attr: [NovaPlacementBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config: