summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/ha
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2016-01-12 14:49:03 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-12 14:49:03 +0000
commitb57a954cd8743bcd27a70d33730fac095bdae34d (patch)
treea9b26840a2fe9895ba7578c8c9bc6704a668b47c /deploy/adapters/ansible/roles/ha
parent704043ac8820ced6c1a9ae16cff3e27a4c36ae43 (diff)
parent4b9e28352916ff617082393c6596b4c1552656da (diff)
Merge "use new options instead of deprecated options for glance"
Diffstat (limited to 'deploy/adapters/ansible/roles/ha')
-rw-r--r--deploy/adapters/ansible/roles/ha/templates/haproxy.cfg6
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 38a113ef..1bca5e39 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() %}