diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-14 03:09:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-14 03:09:48 +0000 |
| commit | 517db1296bf3c6601dc672aebde03966ca8a3e45 (patch) | |
| tree | 91cec76e828a24fe969c7302345fcad85c488565 | |
| parent | a35c7225db2fe6c9e3a208b72a127b2e257f59ca (diff) | |
| parent | 9500bd239ac122ae41de6086112e5e5335ed1558 (diff) | |
| download | kolla-517db1296bf3c6601dc672aebde03966ca8a3e45.tar.gz kolla-517db1296bf3c6601dc672aebde03966ca8a3e45.zip | |
Merge "haproxy formatting was incorrect"
| -rw-r--r-- | ansible/roles/haproxy/templates/haproxy.cfg.j2 | 6 |
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 |