summaryrefslogtreecommitdiffstats
path: root/docker/services/services.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-06 10:32:52 +0000
committerGerrit Code Review <review@openstack.org>2017-03-06 10:32:52 +0000
commit47fcabee464b1e46490087316778b3cff0a55b5b (patch)
treef15d5fcafa2835131da9d13209930d98175cdfa9 /docker/services/services.yaml
parentccb13e7b4227188275cb3f8e599fa8f6f37639c0 (diff)
parent610850140d605b18f4a28099f160fff1e489443d (diff)
Merge "Put docker puppet config in puppet_config dict"
Diffstat (limited to 'docker/services/services.yaml')
-rw-r--r--docker/services/services.yaml4
1 files changed, 1 insertions, 3 deletions
diff --git a/docker/services/services.yaml b/docker/services/services.yaml
index cd9f4cb5..125c4468 100644
--- a/docker/services/services.yaml
+++ b/docker/services/services.yaml
@@ -68,9 +68,7 @@ outputs:
step_config:
{get_attr: [ServiceChain, role_data, step_config]}
docker_image: {get_attr: [ServiceChain, role_data, docker_image]}
- puppet_tags: {get_attr: [ServiceChain, role_data, puppet_tags]}
- config_volume: {get_attr: [ServiceChain, role_data, config_volume]}
- config_image: {get_attr: [ServiceChain, role_data, config_image]}
+ puppet_config: {get_attr: [ServiceChain, role_data, puppet_config]}
kolla_config:
map_merge: {get_attr: [ServiceChain, role_data, kolla_config]}
docker_config: