aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamYaple <sam@yaple.net>2016-03-14 00:17:02 +0000
committerSamYaple <sam@yaple.net>2016-03-14 00:24:38 +0000
commit9500bd239ac122ae41de6086112e5e5335ed1558 (patch)
tree5007ac376f155cc74fa36e6f529cf69e4971cde3
parent0bb766c12986128db9bc78251fed1d8283c44aa9 (diff)
downloadkolla-9500bd239ac122ae41de6086112e5e5335ed1558.tar.gz
kolla-9500bd239ac122ae41de6086112e5e5335ed1558.zip
haproxy formatting was incorrect
haproxy 1.6+ does not allow the formatting that was used for stats listener. We need to adjust it to the correct syntax TrivialFix Change-Id: I5f0111c756d40a0cf7385e6963ebbb57adb36b35
-rw-r--r--ansible/roles/haproxy/templates/haproxy.cfg.j26
1 files changed, 4 insertions, 2 deletions
diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2
index a0703e0fb..542d86247 100644
--- a/ansible/roles/haproxy/templates/haproxy.cfg.j2
+++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2
@@ -24,7 +24,8 @@ defaults
timeout server 1m
timeout check 10s
-listen stats {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ haproxy_stats_port }}
+listen stats
+ bind {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ haproxy_stats_port }}
mode http
stats enable
stats uri /
@@ -226,7 +227,8 @@ listen horizon_external
server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:80 check inter 2000 rise 2 fall 5
{% endfor %}
-frontend horizon_external_redirect {{ kolla_external_vip_address }}:80
+frontend horizon_external_redirect
+ bind {{ kolla_external_vip_address }}:80
redirect scheme https code 301 if !{ ssl_fc }
{% else %}
listen horizon_external