Merge "Fix access to /var/lib/haproxy when SELinux is enabled"

This commit is contained in:
Zuul 2018-12-14 22:08:29 +00:00 committed by Gerrit Code Review
commit 1a4ee4ee0e
1 changed files with 2 additions and 2 deletions

View File

@ -226,7 +226,7 @@ outputs:
# the necessary bit and prevent systemd to try to reload the service in the container
- /usr/libexec/iptables:/usr/libexec/iptables:ro
- /usr/libexec/initscripts/legacy-actions:/usr/libexec/initscripts/legacy-actions:ro
- /var/lib/haproxy:/var/lib/haproxy:rw
- /var/lib/haproxy:/var/lib/haproxy:rw,z
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
haproxy:
@ -242,7 +242,7 @@ outputs:
-
- /var/lib/kolla/config_files/haproxy.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/haproxy/:/var/lib/kolla/config_files/src:ro
- /var/lib/haproxy:/var/lib/haproxy:rw
- /var/lib/haproxy:/var/lib/haproxy:rw,z
- if:
- public_tls_enabled
- - list_join: