From b53e83c465bab964421943547363989789c2057b Mon Sep 17 00:00:00 2001 From: Liam Young Date: Mon, 23 Apr 2018 13:56:48 +0000 Subject: [PATCH] Enable proxy header parsing Ensure that oslo.middleware parses any proxy information forwarded from haproxy/apache with regards to protocol; this ensures that https connections are correctly detected. Includes charm helper sync to bring in oslo middleware template. Change-Id: If1f3913967082618e7004d4b552d14fc2fe7b937 Closes-Bug: 1758675 --- templates/mitaka/neutron.conf | 2 ++ templates/newton/neutron.conf | 2 ++ templates/ocata/neutron.conf | 2 ++ templates/pike/neutron.conf | 2 ++ 4 files changed, 8 insertions(+) diff --git a/templates/mitaka/neutron.conf b/templates/mitaka/neutron.conf index 12cc75b8..0985604f 100644 --- a/templates/mitaka/neutron.conf +++ b/templates/mitaka/neutron.conf @@ -117,3 +117,5 @@ lock_path = $state_path/lock {% if enable_designate -%} {% include "parts/section-designate" %} {% endif -%} + +{% include "section-oslo-middleware" %} diff --git a/templates/newton/neutron.conf b/templates/newton/neutron.conf index c7f39bf7..4ee6b8e2 100644 --- a/templates/newton/neutron.conf +++ b/templates/newton/neutron.conf @@ -121,3 +121,5 @@ lock_path = $state_path/lock [service_providers] service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default service_provider = VPN:strongswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default + +{% include "section-oslo-middleware" %} diff --git a/templates/ocata/neutron.conf b/templates/ocata/neutron.conf index 4c645ed1..9b8804bb 100644 --- a/templates/ocata/neutron.conf +++ b/templates/ocata/neutron.conf @@ -123,3 +123,5 @@ lock_path = $state_path/lock [service_providers] service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default service_provider = VPN:strongswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default + +{% include "section-oslo-middleware" %} diff --git a/templates/pike/neutron.conf b/templates/pike/neutron.conf index a6385347..08b81249 100644 --- a/templates/pike/neutron.conf +++ b/templates/pike/neutron.conf @@ -122,3 +122,5 @@ lock_path = $state_path/lock [service_providers] service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default + +{% include "section-oslo-middleware" %}