diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-06-29 20:12:59 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-06-29 20:12:59 +0000 |
commit | e8d8eae59cf7fac1378ddb6dc78c847abb77c22f (patch) | |
tree | 2290212e2b6f529824dc499badfba578a892421b /docker/services/database/redis.yaml | |
parent | 3b7de8a2514cf9b90ee7aec3365bfbf4547175ad (diff) | |
parent | a474ae82d5f157a48c997fb9df420442bd79dcbe (diff) |
Merge "Add heat parameter for all of config_volume images"
Diffstat (limited to 'docker/services/database/redis.yaml')
-rw-r--r-- | docker/services/database/redis.yaml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/docker/services/database/redis.yaml b/docker/services/database/redis.yaml index 9d0d30c8..0a490cd3 100644 --- a/docker/services/database/redis.yaml +++ b/docker/services/database/redis.yaml @@ -12,6 +12,10 @@ parameters: description: image default: 'centos-binary-redis:latest' type: string + DockerRedisConfigImage: + description: The container image to use for the redis config_volume + default: 'centos-binary-redis:latest' + type: string EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set @@ -64,10 +68,10 @@ outputs: # https://github.com/arioch/puppet-redis/commit/1c004143223e660cbd433422ff8194508aab9763 puppet_tags: 'exec' step_config: *step_config - config_image: &redis_image + config_image: list_join: - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerRedisImage} ] + - [ {get_param: DockerNamespace}, {get_param: DockerRedisConfigImage} ] kolla_config: /var/lib/kolla/config_files/redis.json: command: /usr/bin/redis-server /etc/redis.conf @@ -80,7 +84,10 @@ outputs: redis_init_logs: start_order: 0 detach: false - image: *redis_image + image: &redis_image + list_join: + - '/' + - [ {get_param: DockerNamespace}, {get_param: DockerRedisImage} ] privileged: false user: root volumes: |