summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2017-04-27 11:38:24 +0200
committerMartin André <m.andre@redhat.com>2017-04-27 16:20:59 +0200
commitf11c2232cc483dc01b910efa6e546095e9f866f8 (patch)
tree9c75af4aff88cd9857e87a4a58e17493cd708fb5 /docker
parent933dd62de3867cafe166ed5598e112a9093d1399 (diff)
Fix redis container
The puppet-redis module makes use of the exec puppet tag to copy the /etc/redis.conf.puppet file to /etc/redis.conf. We need to explicitly enable it otherwise our redis container will pick up the default redis configuration and not the one that was generated with puppet. Also creates the /var/run/redis directory on the host since we bind mount /run, and ensure the container sets the correct ownership on the directory. Finally, configure redis to not daemonize otherwise the container ends up in a restart loop. Change-Id: Ia1dce2120ca7479eef8bc77dedf9431adbe210cc Closes-Bug: #1686707
Diffstat (limited to 'docker')
-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