summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2016-01-04 08:13:25 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-04 08:13:25 +0000
commit021013f290a360493960d8039d8e0fcc6a5883a5 (patch)
tree4c55078179b6a06080d07ac964d6c7b578425b82 /deploy
parentdbe9a838fa56dfd66a691ff13de0baba896bb111 (diff)
parente391265196262533c0d2cf87f909680643435870 (diff)
Merge "bugfix: align with codes in haproxy.cfg.j2"
Diffstat (limited to 'deploy')
-rwxr-xr-xdeploy/adapters/ansible/roles/open-contrail/templates/provision/haproxy-contrail-cfg.j280
1 files 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