Merge "keystoneclient now supports Py3K"
This commit is contained in:
commit
06667a34d4
@ -15,9 +15,6 @@
|
||||
|
||||
"""Middleware for handling authorization and authentication."""
|
||||
|
||||
import six
|
||||
|
||||
if not six.PY3:
|
||||
from keystoneclient.middleware import auth_token
|
||||
|
||||
from marconi.openstack.common import log
|
||||
@ -49,7 +46,6 @@ class KeystoneAuth(object):
|
||||
return auth_token.AuthProtocol(app, conf=conf)
|
||||
|
||||
|
||||
if not six.PY3:
|
||||
STRATEGIES['keystone'] = KeystoneAuth
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user