summaryrefslogtreecommitdiff
path: root/ironic/api/middleware
diff options
context:
space:
mode:
authorDevananda van der Veen <devananda.vdv@gmail.com>2014-07-15 15:35:45 -0700
committerDevananda van der Veen <devananda.vdv@gmail.com>2014-08-11 15:33:58 -0700
commit50003a107d48053683229e81ea20c989f3f5c0a2 (patch)
tree360adeab84b35537031f4c31055557d373302cfe /ironic/api/middleware
parentdc8418d22ce57d72a5daf60216635fdda223ec3a (diff)
downloadironic-50003a107d48053683229e81ea20c989f3f5c0a2.tar.gz
Use auth_token from keystonemiddleware
auth_token middleware in python-keystoneclient is deprecated and has been moved to the keystonemiddleware repo. This patch updates Ironic to use the new keystonemiddleware package. Change-Id: Ifb48996867f9f51c4dbedde0e0d9476c2d2818b4 Closes-Bug: #1342274
Diffstat (limited to 'ironic/api/middleware')
-rw-r--r--ironic/api/middleware/auth_token.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ironic/api/middleware/auth_token.py b/ironic/api/middleware/auth_token.py
index 9cad079b3..d30f5d9ab 100644
--- a/ironic/api/middleware/auth_token.py
+++ b/ironic/api/middleware/auth_token.py
@@ -14,7 +14,7 @@
import re
-from keystoneclient.middleware import auth_token
+from keystonemiddleware import auth_token
from ironic.common import exception
from ironic.common import utils
@@ -54,6 +54,6 @@ class AuthTokenMiddleware(auth_token.AuthProtocol):
self.public_api_routes))
if env['is_public_api']:
- return self.app(env, start_response)
+ return self._app(env, start_response)
return super(AuthTokenMiddleware, self).__call__(env, start_response)