commit 1a453ae4d443e5315e76956ad5bb70dfbb26f05f
author Vasyl Saienko <vsaienko@mirantis.com> Mon Sep 24 09:42:01 2018 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> Mon Sep 24 09:42:01 2018 +0000
tree 09bc347c616ec2d0533ad4815567bb55fa7a8e94
parent f42fe3fe647e9da695238c383aa9522c26afcc40
parent 5315755ae7c127037a55f4df2c5c19762d4764a8

Merge "Enable proxy_headers_parsing by default"

neutron/files/ocata/neutron-server.conf

diff --git a/neutron/files/ocata/neutron-server.conf b/neutron/files/ocata/neutron-server.conf
index 6700549..a7645e7 100644
--- a/neutron/files/ocata/neutron-server.conf
+++ b/neutron/files/ocata/neutron-server.conf
@@ -2084,7 +2084,7 @@
 
 # Whether the application is behind a proxy or not. This determines if the
 # middleware should parse the headers or not. (boolean value)
-#enable_proxy_headers_parsing = false
+enable_proxy_headers_parsing = {{ server.get('enable_proxy_headers_parsing', True) }}
 
 
 [oslo_policy]

neutron/files/pike/neutron-server.conf

diff --git a/neutron/files/pike/neutron-server.conf b/neutron/files/pike/neutron-server.conf
index 3844c85..49e8006 100644
--- a/neutron/files/pike/neutron-server.conf
+++ b/neutron/files/pike/neutron-server.conf
@@ -2118,7 +2118,7 @@
 
 # Whether the application is behind a proxy or not. This determines if the
 # middleware should parse the headers or not. (boolean value)
-#enable_proxy_headers_parsing = false
+enable_proxy_headers_parsing = {{ server.get('enable_proxy_headers_parsing', True) }}
 
 
 [oslo_policy]