openstack/kolla-ansible
Code Issues Proposed changes

Merge "Haproxy: fix haproxy_cmd for Debian"

Browse Source
This commit is contained in:
Zuul 2019-10-03 14:50:29 +00:00 committed by Gerrit Code Review
commit c8509dbeac
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/haproxy/templates/haproxy_run.sh.j2
View File

@ -1,5 +1,5 @@
#!/bin/bash -x #!/bin/bash -x
{% set haproxy_cmd='/usr/sbin/haproxy -W -db' if kolla_base_distro in ['ubuntu'] else '/usr/sbin/haproxy-systemd-wrapper' %} {% set haproxy_cmd='/usr/sbin/haproxy -W -db' if kolla_base_distro in ['debian', 'ubuntu'] else '/usr/sbin/haproxy-systemd-wrapper' %}
# We need to run haproxy with one `-f` for each service, because including an # We need to run haproxy with one `-f` for each service, because including an
# entire config directory was not a feature until version 1.7 of HAProxy. # entire config directory was not a feature until version 1.7 of HAProxy.