From acc0940e8e74b4ce5be989e0bec21a19888b7d51 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 1 Jun 2015 17:45:41 -0400 Subject: [PATCH] Get rid of oslo-incubator copy of middleware We have already moved away from openstack/common/middleware modules to the oslo_middlware library. Let us cleanup the remaining files here. Change-Id: I9fe551385aa11ee0da23d77fc8fef6107ae2a026 --- etc/heat/api-paste.ini | 2 +- heat/openstack/common/middleware/__init__.py | 0 .../openstack/common/middleware/request_id.py | 27 ------------------- openstack-common.conf | 1 - 4 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 heat/openstack/common/middleware/__init__.py delete mode 100644 heat/openstack/common/middleware/request_id.py diff --git a/etc/heat/api-paste.ini b/etc/heat/api-paste.ini index a0b48fe47e..e75c3a1247 100644 --- a/etc/heat/api-paste.ini +++ b/etc/heat/api-paste.ini @@ -96,7 +96,7 @@ paste.filter_factory = heat.common.custom_backend_auth:filter_factory # Middleware to set x-openstack-request-id in http response header [filter:request_id] -paste.filter_factory = oslo.middleware.request_id:RequestId.factory +paste.filter_factory = oslo_middleware.request_id:RequestId.factory [filter:osprofiler] paste.filter_factory = osprofiler.web:WsgiMiddleware.factory diff --git a/heat/openstack/common/middleware/__init__.py b/heat/openstack/common/middleware/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/heat/openstack/common/middleware/request_id.py b/heat/openstack/common/middleware/request_id.py deleted file mode 100644 index 07ea8cca57..0000000000 --- a/heat/openstack/common/middleware/request_id.py +++ /dev/null @@ -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 heat.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 diff --git a/openstack-common.conf b/openstack-common.conf index f005532c70..9804de3188 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -7,7 +7,6 @@ module=loopingcall module=service module=threadgroup module=versionutils -module=middleware.request_id # The base module to hold the copy of openstack.common base=heat