openstack/kolla
Code Issues Proposed changes

haproxy formatting was incorrect

Browse Source 
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
This commit is contained in:
SamYaple 2016-03-14 00:17:02 +00:00
parent 0bb766c129
commit 9500bd239a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/haproxy/templates/haproxy.cfg.j2
View File

@ -24,7 +24,8 @@ defaults
timeout server 1m timeout server 1m
timeout check 10s 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 mode http
stats enable stats enable
stats uri / 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 server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:80 check inter 2000 rise 2 fall 5
{% endfor %} {% 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 } redirect scheme https code 301 if !{ ssl_fc }
{% else %} {% else %}
listen horizon_external listen horizon_external