openstack/kolla-ansible
Code Issues Proposed changes

Merge "Compatible with ubuntu 18.04"

Browse Source
This commit is contained in:
Zuul 2018-06-05 02:30:54 +00:00 committed by Gerrit Code Review
commit e3494638a2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/roles/haproxy/templates/haproxy.json.j2
View File

@ -1,5 +1,6 @@
{% set haproxy_cmd='/usr/sbin/haproxy -W -db' if kolla_base_distro in ['ubuntu'] else '/usr/sbin/haproxy-systemd-wrapper' %}
{ {
"command": "/usr/sbin/haproxy-systemd-wrapper -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid", "command": "{{ haproxy_cmd }} -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid",
"config_files": [ "config_files": [
{ {
"source": "{{ container_config_directory }}/haproxy.cfg", "source": "{{ container_config_directory }}/haproxy.cfg",