From e391265196262533c0d2cf87f909680643435870 Mon Sep 17 00:00:00 2001
From: "chenshuai@huawei.com" <chenshuai@huawei.com>
Date: Mon, 4 Jan 2016 15:05:28 +0800
Subject: bugfix: align with codes in haproxy.cfg.j2

JIRA: COMPASS-236

Change-Id: I515f85da937e57e14f3962a7fc51a14dd42d900f
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
---
 .../templates/provision/haproxy-contrail-cfg.j2    | 80 +++++++++++-----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/haproxy-contrail-cfg.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/haproxy-contrail-cfg.j2
index d7691b6b..27d033c7 100755
--- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/haproxy-contrail-cfg.j2
+++ b/deploy/adapters/ansible/roles/open-contrail/templates/provision/haproxy-contrail-cfg.j2
@@ -1,19 +1,19 @@
 #contrail-marker-start
 
 listen contrail-stats
-#	bind *:5937
-        bind {{ internal_vip.ip }}:5937
-        bind {{ public_vip.ip }}:5937
-	mode http
-	stats enable
-	stats uri /
-	stats auth haproxy:contrail123
+#   bind *:5937
+    bind {{ internal_vip.ip }}:5937
+    bind {{ public_vip.ip }}:5937
+    mode http
+    stats enable
+    stats uri /
+    stats auth haproxy:contrail123
 
 # compass has bind neutron-server
 #listen neutron-server
-#	bind *:9696
-#	balance roundrobin
-#	option nolinger
+#    bind *:9696
+#balance roundrobin
+#    option nolinger
 #{% for host,ip in haproxy_hosts.items() %}
 #    server {{ host }} {{ ip }}:9697 weight 1 check inter 2000 rise 2 fall 3
 #{% endfor %}
@@ -21,13 +21,13 @@ listen contrail-stats
 
 
 listen contrail-api
-#	bind *:8082
-        bind {{ internal_vip.ip }}:8082
-        bind {{ public_vip.ip }}:8082
-	balance roundrobin
-	option nolinger
-	timeout client 3m
-	timeout server 3m
+#    bind *:8082
+    bind {{ internal_vip.ip }}:8082
+    bind {{ public_vip.ip }}:8082
+    balance roundrobin
+    option nolinger
+    timeout client 3m
+    timeout server 3m
 {% for host,ip in haproxy_hosts.items() %}
     server {{ host }} {{ ip }}:9100 weight 1 check inter 2000 rise 2 fall 3
 {% endfor %}
@@ -35,11 +35,11 @@ listen contrail-api
 
 
 listen contrail-discovery
-#	bind *:5998
-        bind {{ internal_vip.ip }}:5998
-        bind {{ public_vip.ip }}:5998
-	balance roundrobin
-	option nolinger
+#    bind *:5998
+    bind {{ internal_vip.ip }}:5998
+    bind {{ public_vip.ip }}:5998
+    balance roundrobin
+    option nolinger
 {% for host,ip in haproxy_hosts.items() %}
     server {{ host }} {{ ip }}:9110 weight 1 check inter 2000 rise 2 fall 3
 {% endfor %}
@@ -47,14 +47,14 @@ listen contrail-discovery
 
 
 listen contrail-analytics-api
-#	bind *:8081
-        bind {{ internal_vip.ip }}:8081
-        bind {{ public_vip.ip }}:8081
-	balance roundrobin
-	option nolinger
-	option tcp-check
-	tcp-check connect port 6379
-	default-server error-limit 1 on-error mark-down
+#     bind *:8081
+    bind {{ internal_vip.ip }}:8081
+    bind {{ public_vip.ip }}:8081
+    balance roundrobin
+    option nolinger
+    option tcp-check
+    tcp-check connect port 6379
+    default-server error-limit 1 on-error mark-down
 {% for host,ip in haproxy_hosts.items() %}
     server {{ host }} {{ ip }}:9081 weight 1 check inter 2000 rise 2 fall 5
 {% endfor %}
@@ -62,17 +62,17 @@ listen contrail-analytics-api
 
 # compass doesn't use ha for rabbitmq, but use cluster mode
 #listen rabbitmq
-#	bind *:5673
-#	mode tcp
-#	balance roundrobin
-#	maxconn 10000
-#	option tcplog
-#	option tcpka
-#	option redispatch
-#	timeout client 48h
-#	timeout server 48h
+#    bind *:5673
+#    mode tcp
+#    balance roundrobin
+#    maxconn 10000
+#    option tcplog
+#    option tcpka
+#    option redispatch
+#    timeout client 48h
+#    timeout server 48h
 {% for host,ip in haproxy_hosts.items() %}
-    server {{ host }} {{ ip }}:5672 weight 1 check inter 2000 rise 2 fall 5
+#    server {{ host }} {{ ip }}:5672 weight 1 check inter 2000 rise 2 fall 5
 {% endfor %}
 
 #contrail-marker-end
-- 
cgit 1.2.3-korg