Merge "Set 'balance source' for Horizon in haproxy"

This commit is contained in:
Jenkins 2016-08-28 01:07:29 +00:00 committed by Gerrit Code Review
commit 1b806b66e4

View File

@ -187,6 +187,7 @@ listen neutron_server_external
{% if enable_horizon | bool %} {% if enable_horizon | bool %}
listen horizon listen horizon
bind {{ kolla_internal_vip_address }}:80 bind {{ kolla_internal_vip_address }}:80
balance source
http-request del-header X-Forwarded-Proto http-request del-header X-Forwarded-Proto
{% for host in groups['horizon'] %} {% 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 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 %} {% if kolla_enable_tls_external | bool %}
listen horizon_external listen horizon_external
bind {{ kolla_external_vip_address }}:443 {{ tls_bind_info }} bind {{ kolla_external_vip_address }}:443 {{ tls_bind_info }}
balance source
http-request del-header X-Forwarded-Proto http-request del-header X-Forwarded-Proto
http-request set-header X-Forwarded-Proto https if { ssl_fc } http-request set-header X-Forwarded-Proto https if { ssl_fc }
{% for host in groups['horizon'] %} {% for host in groups['horizon'] %}