Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add nested sample environments for inject-trust-anchor"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
database
/
redis.yaml
diff --git
a/docker/services/database/redis.yaml
b/docker/services/database/redis.yaml
index
86c4490
..
9d0d30c
100644
(file)
--- a/
docker/services/database/redis.yaml
+++ b/
docker/services/database/redis.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
ocata
+heat_template_version:
pike
description: >
OpenStack containerized Redis services
description: >
OpenStack containerized Redis services
@@
-77,7
+77,17
@@
outputs:
recurse: true
docker_config:
step_1:
recurse: true
docker_config:
step_1:
+ redis_init_logs:
+ start_order: 0
+ detach: false
+ image: *redis_image
+ privileged: false
+ user: root
+ volumes:
+ - /var/log/containers/redis:/var/log/redis
+ command: ['/bin/bash', '-c', 'chown -R redis:redis /var/log/redis']
redis:
redis:
+ start_order: 1
image: *redis_image
net: host
privileged: false
image: *redis_image
net: host
privileged: false
@@
-85,16
+95,19
@@
outputs:
volumes:
- /run:/run
- /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro
volumes:
- /run:/run
- /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro
- - /var/lib/config-data/redis/etc/
:/etc/
:ro
+ - /var/lib/config-data/redis/etc/
redis.conf:/etc/redis.conf
:ro
- /etc/localtime:/etc/localtime:ro
- /etc/localtime:/etc/localtime:ro
- -
logs:/var/log/kolla
+ -
/var/log/containers/redis:/var/log/redis
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks:
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks:
- - name: create
/var/run/redi
s
+ - name: create
persistent directorie
s
file:
file:
- path:
/var/run/redis
+ path:
"{{ item }}"
state: directory
state: directory
+ with_items:
+ - /var/log/containers/redis
+ - /var/run/redis
upgrade_tasks:
- name: Stop and disable redis service
tags: step2
upgrade_tasks:
- name: Stop and disable redis service
tags: step2