summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-28 10:25:07 +0000
committerGerrit Code Review <review@openstack.org>2017-04-28 10:25:07 +0000
commit0dd8c85094273e438cbe0e25191560d1803274b4 (patch)
tree57288bfaaf6ef5f98a906104edadd425d67c38f4
parent0a567b9de961ace6ec1b4ca2d01dada9c8e2527c (diff)
parentf11c2232cc483dc01b910efa6e546095e9f866f8 (diff)
Merge "Fix redis container"
-rw-r--r--docker/services/database/redis.yaml19
1 files changed, 17 insertions, 2 deletions
diff --git a/docker/services/database/redis.yaml b/docker/services/database/redis.yaml
index ca7b86ab..aa615919 100644
--- a/docker/services/database/redis.yaml
+++ b/docker/services/database/redis.yaml
@@ -41,14 +41,20 @@ outputs:
description: Role data for the Redis API role.
value:
service_name: {get_attr: [RedisBase, role_data, service_name]}
- config_settings: {get_attr: [RedisBase, role_data, config_settings]}
+ config_settings:
+ map_merge:
+ - {get_attr: [RedisBase, role_data, config_settings]}
+ - redis::daemonize: false
step_config: &step_config
get_attr: [RedisBase, role_data, step_config]
service_config_settings: {get_attr: [RedisBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:
config_volume: 'redis'
- puppet_tags: 'file'
+ # NOTE: we need the exec tag to copy /etc/redis.conf.puppet to
+ # /etc/redis.conf
+ # https://github.com/arioch/puppet-redis/commit/1c004143223e660cbd433422ff8194508aab9763
+ puppet_tags: 'exec'
step_config: *step_config
config_image: &redis_image
list_join:
@@ -57,6 +63,10 @@ outputs:
kolla_config:
/var/lib/kolla/config_files/redis.json:
command: /usr/bin/redis-server /etc/redis.conf
+ permissions:
+ - path: /var/run/redis
+ owner: redis:redis
+ recurse: true
docker_config:
step_1:
redis:
@@ -72,6 +82,11 @@ outputs:
- logs:/var/log/kolla
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+ host_prep_tasks:
+ - name: create /var/run/redis
+ file:
+ path: /var/run/redis
+ state: directory
upgrade_tasks:
- name: Stop and disable redis service
tags: step2