summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-04-15 18:48:11 +0000
committerGerrit Code Review <review@openstack.org>2016-04-15 18:48:11 +0000
commita4104c2aecea4aa50638661dbf1cc3ecdd4dd63a (patch)
tree4b051c75ac6e96a3df5d9c3d976fc5248b259743
parent0078d9b4a172ee8c7cd14d6ba64d1ff341265990 (diff)
parent4c8227ec8bb58d0259f04e26137f9312eecabd5c (diff)
downloadkolla-a4104c2aecea4aa50638661dbf1cc3ecdd4dd63a.tar.gz
kolla-a4104c2aecea4aa50638661dbf1cc3ecdd4dd63a.zip
Merge "Add TLS to Kibana Web Interface"
-rw-r--r--ansible/roles/haproxy/templates/haproxy.cfg.j24
1 files changed, 3 insertions, 1 deletions
diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2
index 7968fa052..72c52cab7 100644
--- a/ansible/roles/haproxy/templates/haproxy.cfg.j2
+++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2
@@ -388,7 +388,9 @@ listen kibana
{% if haproxy_enable_external_vip | bool %}
listen kibana_external
- bind {{ kolla_external_vip_address }}:{{ kibana_server_port }}
+ bind {{ kolla_external_vip_address }}:{{ kibana_server_port }} {{ tls_bind_info }}
+ http-request del-header X-Forwarded-Proto
+ http-request set-header X-Forwarded-Proto https if { ssl_fc }
acl auth_acl http_auth(kibanauser)
http-request auth realm basicauth unless auth_acl
{% for host in groups['kibana'] %}