Merge "Use oslo_middleware sizelimit"

This commit is contained in:
Jenkins 2016-06-10 10:30:47 +00:00 committed by Gerrit Code Review
commit 01fc0e6cd9
3 changed files with 13 additions and 2 deletions

View File

@ -15,7 +15,9 @@
Request Body limiting middleware.
Compatibility shim for Kilo, while operators migrate to oslo.middleware.
"""
# TODO(tbarron): remove this shim in Ocata. Note that although the shim
# was added in Kilo, api-paste.ini was not converted to use oslo.middleware
# until Newton.
from oslo_config import cfg
from oslo_log import versionutils

View File

@ -47,7 +47,7 @@ paste.filter_factory = osprofiler.web:WsgiMiddleware.factory
paste.filter_factory = cinder.api.middleware.auth:NoAuthMiddleware.factory
[filter:sizelimit]
paste.filter_factory = cinder.api.middleware.sizelimit:RequestBodySizeLimiter.factory
paste.filter_factory = oslo_middleware.sizelimit:RequestBodySizeLimiter.factory
[app:apiv1]
paste.app_factory = cinder.api.v1.router:APIRouter.factory

View File

@ -0,0 +1,9 @@
---
upgrade:
- use oslo_middleware.sizelimit rather than cinder.api.middleware.sizelimit
compatibility shim
deprecations:
- cinder.api.middleware.sizelimit was deprecated in kilo and compatability
shim added to call into oslo_middleware. Using oslo_middleware.sizelimit
directly will allow us to remove the compatability shim in a future
release.