aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-28 01:07:29 +0000
committerGerrit Code Review <review@openstack.org>2016-08-28 01:07:29 +0000
commit1b806b66e4225c9facf12ae74f21f49cbb646626 (patch)
treec9d77c2145d80535030cf1ee364935ca5d983584
parent90fe72c2d04c50d4ea5e92564ddaea1acc90f331 (diff)
parent3d12b6c19295d295a62a282d060b309e0c4d99b8 (diff)
downloadkolla-1b806b66e4225c9facf12ae74f21f49cbb646626.tar.gz
kolla-1b806b66e4225c9facf12ae74f21f49cbb646626.zip
Merge "Set 'balance source' for Horizon in haproxy"
-rw-r--r--ansible/roles/haproxy/templates/haproxy.cfg.j22
1 files changed, 2 insertions, 0 deletions
diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2
index d0949ed98..a4af2cafa 100644
--- a/ansible/roles/haproxy/templates/haproxy.cfg.j2
+++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2
@@ -187,6 +187,7 @@ listen neutron_server_external
{% if enable_horizon | bool %}
listen horizon
bind {{ kolla_internal_vip_address }}:80
+ balance source
http-request del-header X-Forwarded-Proto
{% for host in groups['horizon'] %}
server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:80 check inter 2000 rise 2 fall 5
@@ -196,6 +197,7 @@ listen horizon
{% if kolla_enable_tls_external | bool %}
listen horizon_external
bind {{ kolla_external_vip_address }}:443 {{ tls_bind_info }}
+ balance source
http-request del-header X-Forwarded-Proto
http-request set-header X-Forwarded-Proto https if { ssl_fc }
{% for host in groups['horizon'] %}