Merge "We actually require 'mode http'"

ansible/roles/haproxy/templates/haproxy.cfg.j2

@@ -15,6 +15,7 @@ global
 
 defaults
   log global
+  mode http
   option redispatch
   option httplog
   option forwardfor
@@ -230,6 +231,7 @@ listen nova_serialconsole_proxy_external
 
 {% if enable_neutron | bool %}
 listen neutron_server
+  option http-tunnel
   bind {{ kolla_internal_vip_address }}:{{ neutron_server_port }}
 {% 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
@@ -237,6 +239,7 @@ listen neutron_server
 {% if haproxy_enable_external_vip | bool %}
 
 listen neutron_server_external
+  option http-tunnel
   bind {{ kolla_external_vip_address }}:{{ neutron_server_port }} {{ tls_bind_info }}
 {% 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