aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-09 17:29:25 +0000
committerGerrit Code Review <review@openstack.org>2016-03-09 17:29:25 +0000
commitbab46d5ac484ea65f89f74ec628b8889966c298a (patch)
tree949f3588e6e8a69f8dc5d215d2da3330a62a6234
parenta82e7b1239982a89761a10b726220b1f43b61211 (diff)
parent95e8ac65d1d22a944c707fb9bc531446e9547727 (diff)
downloadkolla-bab46d5ac484ea65f89f74ec628b8889966c298a.tar.gz
kolla-bab46d5ac484ea65f89f74ec628b8889966c298a.zip
Merge "Do not make Kibana available at the external VIP"
-rw-r--r--ansible/roles/haproxy/templates/haproxy.cfg.j28
1 files changed, 0 insertions, 8 deletions
diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2
index 0af6a7dbd..a0703e0fb 100644
--- a/ansible/roles/haproxy/templates/haproxy.cfg.j2
+++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2
@@ -377,14 +377,6 @@ listen kibana
{% for host in groups['kibana'] %}
server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ kibana_server_port }} check inter 2000 rise 2 fall 5
{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen kibana_external
- bind {{ kolla_external_vip_address }}:{{ kibana_server_port }}
-{% for host in groups['kibana'] %}
- server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ kibana_server_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
listen elasticsearch
option dontlog-normal