From 82088415139e97342dc706f67f8c903766af2ff7 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Mon, 18 Jul 2016 09:24:29 +0300 Subject: [PATCH] Use http_proxy_to_wsgi instead of ssl middleware The ssl middleware from oslo.middleware is deprecated in favor of http_proxy_to_wsgi, which is used by nova, cinder, glance and several other services. Change-Id: Id33a0f7eeb8ced77d09f9edd6b1d65697d8bcfe7 --- etc/manila/api-paste.ini | 18 +++++++++--------- etc/oslo-config-generator/manila.conf | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/etc/manila/api-paste.ini b/etc/manila/api-paste.ini index 4e0f32eb0b..42395c1618 100644 --- a/etc/manila/api-paste.ini +++ b/etc/manila/api-paste.ini @@ -10,15 +10,15 @@ use = call:manila.api:root_app_factory [composite:openstack_share_api] use = call:manila.api.middleware.auth:pipeline_factory -noauth = cors faultwrap ssl sizelimit noauth api -keystone = cors faultwrap ssl sizelimit authtoken keystonecontext api -keystone_nolimit = cors faultwrap ssl sizelimit authtoken keystonecontext api +noauth = cors faultwrap http_proxy_to_wsgi sizelimit noauth api +keystone = cors faultwrap http_proxy_to_wsgi sizelimit authtoken keystonecontext api +keystone_nolimit = cors faultwrap http_proxy_to_wsgi sizelimit authtoken keystonecontext api [composite:openstack_share_api_v2] use = call:manila.api.middleware.auth:pipeline_factory -noauth = cors faultwrap ssl sizelimit noauth apiv2 -keystone = cors faultwrap ssl sizelimit authtoken keystonecontext apiv2 -keystone_nolimit = cors faultwrap ssl sizelimit authtoken keystonecontext apiv2 +noauth = cors faultwrap http_proxy_to_wsgi sizelimit noauth apiv2 +keystone = cors faultwrap http_proxy_to_wsgi sizelimit authtoken keystonecontext apiv2 +keystone_nolimit = cors faultwrap http_proxy_to_wsgi sizelimit authtoken keystonecontext apiv2 [filter:faultwrap] paste.filter_factory = manila.api.middleware.fault:FaultWrapper.factory @@ -29,8 +29,8 @@ paste.filter_factory = manila.api.middleware.auth:NoAuthMiddleware.factory [filter:sizelimit] paste.filter_factory = oslo_middleware.sizelimit:RequestBodySizeLimiter.factory -[filter:ssl] -paste.filter_factory = oslo_middleware.ssl:SSLMiddleware.factory +[filter:http_proxy_to_wsgi] +paste.filter_factory = oslo_middleware.http_proxy_to_wsgi:HTTPProxyToWSGI.factory [app:api] paste.app_factory = manila.api.v1.router:APIRouter.factory @@ -39,7 +39,7 @@ paste.app_factory = manila.api.v1.router:APIRouter.factory paste.app_factory = manila.api.v2.router:APIRouter.factory [pipeline:apiversions] -pipeline = cors faultwrap osshareversionapp +pipeline = cors faultwrap http_proxy_to_wsgi osshareversionapp [app:osshareversionapp] paste.app_factory = manila.api.versions:VersionsRouter.factory diff --git a/etc/oslo-config-generator/manila.conf b/etc/oslo-config-generator/manila.conf index 676ccb894a..ed21caf556 100644 --- a/etc/oslo-config-generator/manila.conf +++ b/etc/oslo-config-generator/manila.conf @@ -3,6 +3,7 @@ output_file = etc/manila/manila.conf.sample namespace = manila namespace = oslo.messaging namespace = oslo.middleware.cors +namespace = oslo.middleware.http_proxy_to_wsgi namespace = oslo.db namespace = oslo.db.concurrency namespace = keystonemiddleware.auth_token