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 DeployedServerEnvironmentOutput"
[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
0a490cd
..
494fe61
100644
(file)
--- a/
docker/services/database/redis.yaml
+++ b/
docker/services/database/redis.yaml
@@
-75,6
+75,11
@@
outputs:
kolla_config:
/var/lib/kolla/config_files/redis.json:
command: /usr/bin/redis-server /etc/redis.conf
kolla_config:
/var/lib/kolla/config_files/redis.json:
command: /usr/bin/redis-server /etc/redis.conf
+ config_files:
+ - source: "/var/lib/kolla/config_files/src/*"
+ dest: "/"
+ merge: true
+ preserve_properties: true
permissions:
- path: /var/run/redis
owner: redis:redis
permissions:
- path: /var/run/redis
owner: redis:redis
@@
-102,7
+107,7
@@
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/redis.conf:/etc/redis.conf
:ro
+ - /var/lib/config-data/
puppet-generated/redis/:/var/lib/kolla/config_files/src
:ro
- /etc/localtime:/etc/localtime:ro
- /var/log/containers/redis:/var/log/redis
environment:
- /etc/localtime:/etc/localtime:ro
- /var/log/containers/redis:/var/log/redis
environment: