openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "HAProxy: Remove usage of non-existing haproxy-systemd-wrapper"

This commit is contained in:
Zuul 2022-11-16 20:03:58 +00:00 committed by Gerrit Code Review
parent dfadfdc8ea 673945d821
commit c6a5378f63
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment/haproxy/haproxy-container-puppet.yaml
View File

@ -252,10 +252,7 @@ outputs:
- 'ro,shared'
kolla_config:
/var/lib/kolla/config_files/haproxy.json:
# HAProxy 1.8 doesn't ship haproxy-systemd-wrapper, we have
# to use a new dedicated option for live config reload.
# Note: we can't use quotes in kolla command, hence the workaround
command: bash -c $* -- eval if [ -f /usr/sbin/haproxy-systemd-wrapper ]; then exec /usr/sbin/haproxy-systemd-wrapper -f /etc/haproxy/haproxy.cfg; else exec /usr/sbin/haproxy -f /etc/haproxy/haproxy.cfg -Ws; fi
command: /usr/sbin/haproxy -f /etc/haproxy/haproxy.cfg -Ws
config_files:
- source: "/var/lib/kolla/config_files/src/*"
dest: "/"

5
deployment/haproxy/haproxy-pacemaker-puppet.yaml
View File

@ -248,10 +248,7 @@ outputs:
data: *tls_mapping
kolla_config:
/var/lib/kolla/config_files/haproxy.json:
# HAProxy 1.8 doesn't ship haproxy-systemd-wrapper, we have
# to use a new dedicated option for live config reload.
# Note: we can't use quotes in kolla command, hence the workaround
command: bash -c $* -- eval if [ -f /usr/sbin/haproxy-systemd-wrapper ]; then exec /usr/sbin/haproxy-systemd-wrapper -f /etc/haproxy/haproxy.cfg; else exec /usr/sbin/haproxy -f /etc/haproxy/haproxy.cfg -Ws; fi
command: /usr/sbin/haproxy -f /etc/haproxy/haproxy.cfg -Ws
config_files:
- source: "/var/lib/kolla/config_files/src/*"
dest: "/"