summaryrefslogtreecommitdiff
path: root/nova/api/auth.py
diff options
context:
space:
mode:
authorJoe Gordon <joe.gordon0@gmail.com>2014-10-21 14:51:56 +0000
committerJoe Gordon <joe.gordon0@gmail.com>2014-10-21 08:00:29 -0700
commit7f7cfc2dc6baa53adbea431aba840cd88eea8040 (patch)
treeec5f014f1fb0a859961277f19bfd6ffc88f8f905 /nova/api/auth.py
parent641de5666f38532252e91735a1cd2611d96c489a (diff)
downloadnova-7f7cfc2dc6baa53adbea431aba840cd88eea8040.tar.gz
Revert "Replace outdated oslo-incubator middleware"
This is breaking the Juno -> master grenade path. As we are using the old api-paste.ini file which requires the oslo-incubator copy of request_id This breakage didn't happen from Icehouse -> master since the icehouse api-paste.ini didn't have request_id as a middleware. request_id is only used as middleware in the V21/V3 API and not the V2 API. Closes-Bug: #1383757 This reverts commit 641de5666f38532252e91735a1cd2611d96c489a. Change-Id: I1ca6bddf9d9370529e999efcc7eae60622e19e6f
Diffstat (limited to 'nova/api/auth.py')
-rw-r--r--nova/api/auth.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/auth.py b/nova/api/auth.py
index 1c99037570..d6e6c1430c 100644
--- a/nova/api/auth.py
+++ b/nova/api/auth.py
@@ -17,7 +17,6 @@ Common Auth Middleware.
"""
from oslo.config import cfg
-from oslo.middleware import request_id
from oslo.serialization import jsonutils
import webob.dec
import webob.exc
@@ -26,6 +25,7 @@ from nova import context
from nova.i18n import _
from nova.i18n import _LW
from nova.openstack.common import log as logging
+from nova.openstack.common.middleware import request_id
from nova import wsgi