openstack/cinder
Code Issues Proposed changes

Merge "Get rid of oslo-incubator copy of middleware"

Browse Source
This commit is contained in:
Jenkins 2015-06-16 04:22:38 +00:00 committed by Gerrit Code Review
commit 106261582f
4 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
cinder/openstack/common/middleware/__init__.py
View File

23
cinder/openstack/common/middleware/catch_errors.py
View File

@ -1,23 +0,0 @@
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
"""Compatibility shim for Kilo, while operators migrate to oslo.middleware."""
from oslo_middleware import catch_errors
from cinder.openstack.common import versionutils
@versionutils.deprecated(as_of=versionutils.deprecated.KILO,
in_favor_of='oslo_middleware.CatchErrors')
class CatchErrorsMiddleware(catch_errors.CatchErrors):
pass

27
cinder/openstack/common/middleware/request_id.py
View File

@ -1,27 +0,0 @@
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
"""Compatibility shim for Kilo, while operators migrate to oslo.middleware."""
from oslo_middleware import request_id
from cinder.openstack.common import versionutils
ENV_REQUEST_ID = 'openstack.request_id'
HTTP_RESP_HEADER_REQUEST_ID = 'x-openstack-request-id'
@versionutils.deprecated(as_of=versionutils.deprecated.KILO,
in_favor_of='oslo_middleware.RequestId')
class RequestIdMiddleware(request_id.RequestId):
pass

1
openstack-common.conf
View File

@ -8,7 +8,6 @@ module=gettextutils
module=imageutils module=imageutils
module=install_venv_common module=install_venv_common
module=loopingcall module=loopingcall
module=middleware
module=periodic_task module=periodic_task
module=policy module=policy
module=scheduler module=scheduler