From be6798fc30b6041a24875be18469e535f3803206 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Wed, 16 May 2018 10:54:09 +0800 Subject: [PATCH] Compatible with ubuntu 18.04 Depends-On: https://review.openstack.org/568529 Change-Id: I8084e4c8406c818589ca984afe5b5364c00b08ca --- ansible/roles/haproxy/templates/haproxy.json.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ansible/roles/haproxy/templates/haproxy.json.j2 b/ansible/roles/haproxy/templates/haproxy.json.j2 index 9e0d2808f8..31ed4c5972 100644 --- a/ansible/roles/haproxy/templates/haproxy.json.j2 +++ b/ansible/roles/haproxy/templates/haproxy.json.j2 @@ -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": [ { "source": "{{ container_config_directory }}/haproxy.cfg",