Revert "Importing correlation_id middleware from oslo-incubator"

This reverts commit 26ecf7b023.

This patch was merged in preparation for
https://review.openstack.org/#/c/29480/ which was never merged.

Change-Id: Iefa1478af03f748ccb5f27f8bd4ad0f5b24af070

nova/openstack/common/middleware/correlation_id.py

@@ -1,29 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Rackspace Hosting
-# All Rights Reserved.
-#
-#    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.
-
-"""Middleware that attaches a correlation id to WSGI request"""
-
-from nova.openstack.common import uuidutils
-from nova import wsgi
-
-
-class CorrelationIdMiddleware(wsgi.Middleware):
-
-    def process_request(self, req):
-        correlation_id = (req.headers.get("X_CORRELATION_ID") or
-                          uuidutils.generate_uuid())
-        req.headers['X_CORRELATION_ID'] = correlation_id

openstack-common.conf

@@ -19,7 +19,6 @@ module=lockutils
 module=log
 module=loopingcall
 module=memorycache
-module=middleware.correlation_id
 module=network_utils
 module=notifier
 module=patch_tox_venv