Merge "Fix redis_tls_proxy" into stable/ussuri
This commit is contained in:
commit
537ce79832
|
@ -233,6 +233,28 @@ outputs:
|
||||||
perm: '0600'
|
perm: '0600'
|
||||||
optional: true
|
optional: true
|
||||||
container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
|
container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
|
||||||
|
docker_config:
|
||||||
|
step_1:
|
||||||
|
if:
|
||||||
|
- internal_tls_enabled
|
||||||
|
- redis_tls_proxy:
|
||||||
|
start_order: 0
|
||||||
|
image: {get_param: ContainerRedisImage}
|
||||||
|
net: host
|
||||||
|
user: root
|
||||||
|
restart: always
|
||||||
|
volumes:
|
||||||
|
list_concat:
|
||||||
|
- {get_attr: [ContainersCommon, volumes]}
|
||||||
|
-
|
||||||
|
- /var/lib/kolla/config_files/redis_tls_proxy.json:/var/lib/kolla/config_files/config.json:ro
|
||||||
|
- /var/lib/config-data/puppet-generated/redis:/var/lib/kolla/config_files/src:ro
|
||||||
|
- /etc/pki/tls/certs/redis.crt:/var/lib/kolla/config_files/src-tls/etc/pki/tls/certs/redis.crt:ro
|
||||||
|
- /etc/pki/tls/private/redis.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/redis.key:ro
|
||||||
|
- /var/lib/container-config-scripts/wait-port-and-run.sh:/wait-port-and-run.sh:ro
|
||||||
|
environment:
|
||||||
|
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
||||||
|
- {}
|
||||||
metadata_settings:
|
metadata_settings:
|
||||||
get_attr: [RedisBase, role_data, metadata_settings]
|
get_attr: [RedisBase, role_data, metadata_settings]
|
||||||
host_prep_tasks:
|
host_prep_tasks:
|
||||||
|
|
Loading…
Reference in New Issue