aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/memcached.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/memcached.yaml
parentccb13e7b4227188275cb3f8e599fa8f6f37639c0 (diff)
parent610850140d605b18f4a28099f160fff1e489443d (diff)
Merge "Put docker puppet config in puppet_config dict"
Diffstat (limited to 'docker/services/memcached.yaml')
-rw-r--r--docker/services/memcached.yaml11
1 files changed, 7 insertions, 4 deletions
diff --git a/docker/services/memcached.yaml b/docker/services/memcached.yaml
index d459c825..3e51f5b4 100644
--- a/docker/services/memcached.yaml
+++ b/docker/services/memcached.yaml
@@ -42,16 +42,19 @@ outputs:
value:
service_name: {get_attr: [MemcachedBase, role_data, service_name]}
config_settings: {get_attr: [MemcachedBase, role_data, config_settings]}
- step_config: {get_attr: [MemcachedBase, role_data, step_config]}
+ step_config: &step_config
+ get_attr: [MemcachedBase, role_data, step_config]
service_config_settings: {get_attr: [MemcachedBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
docker_image: &memcached_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerMemcachedImage} ]
- puppet_tags: 'file'
- config_volume: 'memcached'
- config_image: *memcached_image
+ puppet_config:
+ config_volume: 'memcached'
+ puppet_tags: 'file'
+ step_config: *step_config
+ config_image: *memcached_image
kolla_config: {}
docker_config:
step_1: