aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-08 14:05:08 +0000
committerGerrit Code Review <review@openstack.org>2016-03-08 14:05:08 +0000
commit78c7bea33b9db9e6054e835b231edb79bbf1f5ee (patch)
treed472d3196fb4353855712f89a5ad0e444b8fe00d
parent492ad93321f0ec7461d1661582520b8bc1ec9d00 (diff)
parent3b378b11edd74e5263945927b147ea3def34604d (diff)
downloadkolla-78c7bea33b9db9e6054e835b231edb79bbf1f5ee.tar.gz
kolla-78c7bea33b9db9e6054e835b231edb79bbf1f5ee.zip
Merge "Glance registry should only be accessible from internal network"
-rw-r--r--ansible/roles/haproxy/templates/haproxy.cfg.j26
1 files changed, 0 insertions, 6 deletions
diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2
index 56d34e79b..0af6a7dbd 100644
--- a/ansible/roles/haproxy/templates/haproxy.cfg.j2
+++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2
@@ -101,12 +101,6 @@ listen glance_api
{% endfor %}
{% if haproxy_enable_external_vip | bool %}
-listen glance_registry_external
- bind {{ kolla_external_vip_address }}:{{ glance_registry_port }} {{ tls_bind_info }}
-{% for host in groups['glance-registry'] %}
- server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ glance_registry_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-
listen glance_api_external
bind {{ kolla_external_vip_address }}:{{ glance_api_port }} {{ tls_bind_info }}
{% for host in groups['glance-api'] %}