diff options
| author |   shuai chen <chenshuai@huawei.com> | 2016-01-12 15:24:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-12 15:24:45 +0000 |
| commit | b9a63edede430b4d1a70d3f81b426566665195c5 (patch) | |
| tree | 7b22281cac6f6c3f4090e1126b9610f281b36e5f /deploy/adapters/ansible/roles/ha/templates/haproxy.cfg | |
| parent | aa3fc71cd8ae532f33d03f3540a54feef5a965b1 (diff) | |
| parent | c105a9057d3b256a3f4ca76e40bb280d7cfc13b9 (diff) | |
Merge "use new options instead of deprecated options for glance" into stable/brahmaputra
Diffstat (limited to 'deploy/adapters/ansible/roles/ha/templates/haproxy.cfg')
| -rw-r--r-- | deploy/adapters/ansible/roles/ha/templates/haproxy.cfg | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg b/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg index edbd998d..5f0679ff 100644 --- a/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg +++ b/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg @@ -56,6 +56,7 @@ listen proxy-glance_registry_cluster bind {{ public_vip.ip }}:9191 option tcpka option tcplog + option httpchk balance source {% for host,ip in haproxy_hosts.items() %} server {{ host }} {{ ip }}:9191 weight 1 check inter 2000 rise 2 fall 5 @@ -66,6 +67,7 @@ listen proxy-glance_api_cluster bind {{ public_vip.ip }}:9292 option tcpka option tcplog + option httpchk balance source {% for host,ip in haproxy_hosts.items() %} server {{ host }} {{ ip }}:9292 weight 1 check inter 2000 rise 2 fall 5 @@ -76,6 +78,7 @@ listen proxy-nova-novncproxy bind {{ public_vip.ip }}:6080 option tcpka option tcplog + option httpchk balance source {% for host,ip in haproxy_hosts.items() %} server {{ host }} {{ ip }}:6080 weight 1 check inter 2000 rise 2 fall 5 @@ -87,6 +90,7 @@ listen proxy-network option tcpka option tcplog balance source + option httpchk {% for host,ip in haproxy_hosts.items() %} server {{ host }} {{ ip }}:9696 weight 1 check inter 2000 rise 2 fall 5 {% endfor %} @@ -140,6 +144,7 @@ listen proxy-nova_metadata_api_cluster bind {{ public_vip.ip }}:8775 option tcpka option tcplog + option httpchk balance source {% for host,ip in haproxy_hosts.items() %} server {{ host }} {{ ip }}:8775 weight 1 check inter 2000 rise 2 fall 5 @@ -175,6 +180,7 @@ listen proxy-dashboarad cookie SERVERID insert indirect nocache option forwardfor option httpchk + option httpchk option httpclose rspidel ^Set-cookie:\ IP= {% for host,ip in haproxy_hosts.items() %} |