openstack/kolla-ansible
Code Issues Proposed changes

Merge "We actually require 'mode http'"

Browse Source
This commit is contained in:
Zuul 2018-01-19 09:59:11 +00:00 committed by Gerrit Code Review
commit 5cfd101057
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/roles/haproxy/templates/haproxy.cfg.j2
View File

@ -15,6 +15,7 @@ global
defaults defaults
log global log global
mode http
option redispatch option redispatch
option httplog option httplog
option forwardfor option forwardfor
@ -230,6 +231,7 @@ listen nova_serialconsole_proxy_external
{% if enable_neutron | bool %} {% if enable_neutron | bool %}
listen neutron_server listen neutron_server
option http-tunnel
bind {{ kolla_internal_vip_address }}:{{ neutron_server_port }} bind {{ kolla_internal_vip_address }}:{{ neutron_server_port }}
{% for host in groups['neutron-server'] %} {% for host in groups['neutron-server'] %}
server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ neutron_server_port }} check inter 2000 rise 2 fall 5 server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ neutron_server_port }} check inter 2000 rise 2 fall 5
@ -237,6 +239,7 @@ listen neutron_server
{% if haproxy_enable_external_vip | bool %} {% if haproxy_enable_external_vip | bool %}
listen neutron_server_external listen neutron_server_external
option http-tunnel
bind {{ kolla_external_vip_address }}:{{ neutron_server_port }} {{ tls_bind_info }} bind {{ kolla_external_vip_address }}:{{ neutron_server_port }} {{ tls_bind_info }}
{% for host in groups['neutron-server'] %} {% for host in groups['neutron-server'] %}
server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ neutron_server_port }} check inter 2000 rise 2 fall 5 server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ neutron_server_port }} check inter 2000 rise 2 fall 5