From 4b9e28352916ff617082393c6596b4c1552656da Mon Sep 17 00:00:00 2001
From: "carey.xu" <carey.xuhan@huawei.com>
Date: Thu, 7 Jan 2016 12:41:14 +0800
Subject: use new options instead of deprecated options for glance

JIRA: COMPASS-247

Change-Id: If034fad5a17d6b1d462ae1a54bdb5d641173d720
Signed-off-by: carey.xu <carey.xuhan@huawei.com>
---
 deploy/adapters/ansible/roles/ha/templates/haproxy.cfg | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'deploy/adapters/ansible/roles/ha')

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() %}
-- 
cgit 1.2.3-korg