aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ha/templates
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2016-09-19 15:28:20 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-19 15:28:20 +0000
commit185067089ab0755ea4973de5454260d2557b7373 (patch)
treed58a15719549a76864c8febd672c6a854676205b /deploy/adapters/ansible/openstack_mitaka_xenial/roles/ha/templates
parent2171504a5331409c11935adf977a11c77e583f51 (diff)
parent297be8f88ecae18e417cddb37b7ef3fe263fd12e (diff)
Merge "Temporally disable swift support in moon scenario" into stable/colorado
Diffstat (limited to 'deploy/adapters/ansible/openstack_mitaka_xenial/roles/ha/templates')
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/ha/templates/haproxy.cfg18
1 files changed, 9 insertions, 9 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ha/templates/haproxy.cfg b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ha/templates/haproxy.cfg
index 66ea7139..c0a0747d 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ha/templates/haproxy.cfg
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ha/templates/haproxy.cfg
@@ -158,15 +158,15 @@ listen proxy-cinder_api_cluster
server {{ host }} {{ ip }}:8776 weight 1 check inter 2000 rise 2 fall 5
{% endfor %}
-listen proxy-swift-proxy
- bind {{ internal_vip.ip }}:8080
- bind {{ public_vip.ip }}:8080
- balance source
- option tcpka
- option tcplog
-{% for host,ip in haproxy_hosts.items() %}
- server {{ host }} {{ ip }}:8080 weight 1 check inter 2000 rise 2 fall 5
-{% endfor %}
+#listen proxy-swift-proxy
+# bind {{ internal_vip.ip }}:8080
+# bind {{ public_vip.ip }}:8080
+# balance source
+# option tcpka
+# option tcplog
+#{% for host,ip in haproxy_hosts.items() %}
+# server {{ host }} {{ ip }}:8080 weight 1 check inter 2000 rise 2 fall 5
+#{% endfor %}
listen proxy-ceilometer_api_cluster
bind {{ internal_vip.ip }}:8777