summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-21 11:03:51 +0000
committerGerrit Code Review <review@openstack.org>2016-11-21 11:03:52 +0000
commit39ec28436e577c6b245b9d3bf7ef8cc52afb88a9 (patch)
tree0d0509308b5e94338261c51a93cc706bfbcdc957 /etc
parent66f65ec5d14b737acbaca3b95e0336968efbc719 (diff)
parent583d5cd4283895c10e7cac92a8498b6b01676e5f (diff)
downloadtrove-39ec28436e577c6b245b9d3bf7ef8cc52afb88a9.tar.gz
Merge "Use http_proxy_to_wsgi middleware"
Diffstat (limited to 'etc')
-rw-r--r--etc/trove/api-paste.ini5
-rw-r--r--etc/trove/api-paste.ini.test5
-rw-r--r--etc/trove/trove.conf.sample12
3 files changed, 19 insertions, 3 deletions
diff --git a/etc/trove/api-paste.ini b/etc/trove/api-paste.ini
index ea3612b9..5851c0fd 100644
--- a/etc/trove/api-paste.ini
+++ b/etc/trove/api-paste.ini
@@ -7,7 +7,7 @@ use = call:trove.common.wsgi:versioned_urlmap
paste.app_factory = trove.versions:app_factory
[pipeline:troveapi]
-pipeline = cors faultwrapper osprofiler authtoken authorization contextwrapper ratelimit extensions troveapp
+pipeline = cors http_proxy_to_wsgi faultwrapper osprofiler authtoken authorization contextwrapper ratelimit extensions troveapp
#pipeline = debug extensions troveapp
[filter:extensions]
@@ -41,3 +41,6 @@ paste.app_factory = trove.common.api:app_factory
#Add this filter to log request and response for debugging
[filter:debug]
paste.filter_factory = trove.common.wsgi:Debug
+
+[filter:http_proxy_to_wsgi]
+use = egg:oslo.middleware#http_proxy_to_wsgi
diff --git a/etc/trove/api-paste.ini.test b/etc/trove/api-paste.ini.test
index 7f935402..f2b0bc08 100644
--- a/etc/trove/api-paste.ini.test
+++ b/etc/trove/api-paste.ini.test
@@ -7,7 +7,7 @@ use = call:trove.common.wsgi:versioned_urlmap
paste.app_factory = trove.versions:app_factory
[pipeline:troveapi]
-pipeline = faultwrapper authtoken authorization contextwrapper extensions ratelimit troveapp
+pipeline = faultwrapper http_proxy_to_wsgi authtoken authorization contextwrapper extensions ratelimit troveapp
#pipeline = debug extensions troveapp
[filter:extensions]
@@ -42,3 +42,6 @@ paste.app_factory = trove.common.api:app_factory
#Add this filter to log request and response for debugging
[filter:debug]
paste.filter_factory = trove.common.wsgi:Debug
+
+[filter:http_proxy_to_wsgi]
+use = egg:oslo.middleware#http_proxy_to_wsgi
diff --git a/etc/trove/trove.conf.sample b/etc/trove/trove.conf.sample
index 6e4098bf..a64f7522 100644
--- a/etc/trove/trove.conf.sample
+++ b/etc/trove/trove.conf.sample
@@ -309,4 +309,14 @@ api_strategy = trove.common.strategies.cluster.experimental.vertica.api.VerticaA
# Indicate which header field names may be used during the actual request.
# (list value)
-#allow_headers = X-Auth-Token, X-Identity-Status, X-Roles, X-Service-Catalog, X-User-Id, X-Tenant-Id, X-OpenStack-Request-ID \ No newline at end of file
+#allow_headers = X-Auth-Token, X-Identity-Status, X-Roles, X-Service-Catalog, X-User-Id, X-Tenant-Id, X-OpenStack-Request-ID
+
+[oslo_middleware]
+
+#
+# From oslo.middleware
+#
+
+# 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