openstack/kolla-ansible
Code Issues Proposed changes

Compatible with ubuntu 18.04

Browse Source 
Depends-On: https://review.openstack.org/568529
Change-Id: I8084e4c8406c818589ca984afe5b5364c00b08ca
This commit is contained in:
Jeffrey Zhang 2018-05-16 10:54:09 +08:00
parent e303c74e68
commit be6798fc30
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",