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
9d0d30c
..
494fe61
100644
(file)
--- 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
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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@
-64,13
+68,18
@@
outputs:
# https://github.com/arioch/puppet-redis/commit/1c004143223e660cbd433422ff8194508aab9763
puppet_tags: 'exec'
step_config: *step_config
# https://github.com/arioch/puppet-redis/commit/1c004143223e660cbd433422ff8194508aab9763
puppet_tags: 'exec'
step_config: *step_config
- config_image:
&redis_image
+ config_image:
list_join:
- '/'
list_join:
- '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerRedisImage} ]
+ - [ {get_param: DockerNamespace}, {get_param: DockerRedis
Config
Image} ]
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
@@
-80,7
+89,10
@@
outputs:
redis_init_logs:
start_order: 0
detach: false
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:
privileged: false
user: root
volumes:
@@
-95,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: