Merge "Use auth_token from keystonemiddleware"
This commit is contained in:
commit
dc6936f539
@ -226,7 +226,7 @@
|
|||||||
[keystone_authtoken]
|
[keystone_authtoken]
|
||||||
|
|
||||||
#
|
#
|
||||||
# Options defined in keystoneclient.middleware.auth_token
|
# Options defined in keystonemiddleware.auth_token
|
||||||
#
|
#
|
||||||
|
|
||||||
# Prefix to prepend at the beginning of the path (string
|
# Prefix to prepend at the beginning of the path (string
|
||||||
|
@ -5,10 +5,10 @@ netaddr>=0.7.6
|
|||||||
falcon>=0.1.6,<0.2.0
|
falcon>=0.1.6,<0.2.0
|
||||||
jsonschema>=2.0.0,<3.0.0
|
jsonschema>=2.0.0,<3.0.0
|
||||||
iso8601>=0.1.9
|
iso8601>=0.1.9
|
||||||
|
keystonemiddleware>=1.0.0
|
||||||
msgpack-python>=0.4.0
|
msgpack-python>=0.4.0
|
||||||
posix_ipc
|
posix_ipc
|
||||||
pymongo>=2.5
|
pymongo>=2.5
|
||||||
python-keystoneclient>=0.10.0
|
|
||||||
# python-memcached has no Py3k support for now
|
# python-memcached has no Py3k support for now
|
||||||
# python-memcached>=1.48
|
# python-memcached>=1.48
|
||||||
WebOb>=1.2.3
|
WebOb>=1.2.3
|
||||||
|
@ -5,10 +5,10 @@ netaddr>=0.7.6
|
|||||||
falcon>=0.1.6,<0.2.0
|
falcon>=0.1.6,<0.2.0
|
||||||
jsonschema>=2.0.0,<3.0.0
|
jsonschema>=2.0.0,<3.0.0
|
||||||
iso8601>=0.1.9
|
iso8601>=0.1.9
|
||||||
|
keystonemiddleware>=1.0.0
|
||||||
msgpack-python>=0.4.0
|
msgpack-python>=0.4.0
|
||||||
posix_ipc
|
posix_ipc
|
||||||
pymongo>=2.5
|
pymongo>=2.5
|
||||||
python-keystoneclient>=0.10.0
|
|
||||||
python-memcached>=1.48
|
python-memcached>=1.48
|
||||||
WebOb>=1.2.3
|
WebOb>=1.2.3
|
||||||
stevedore>=0.14
|
stevedore>=0.14
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
export OSLO_CONFIG_GENERATOR_EXTRA_MODULES="keystoneclient.middleware.auth_token"
|
export OSLO_CONFIG_GENERATOR_EXTRA_MODULES="keystonemiddleware.auth_token"
|
||||||
export OSLO_CONFIG_GENERATOR_EXTRA_LIBRARIES="zaqar.bootstrap
|
export OSLO_CONFIG_GENERATOR_EXTRA_LIBRARIES="zaqar.bootstrap
|
||||||
zaqar.storage.base
|
zaqar.storage.base
|
||||||
zaqar.storage.pipeline
|
zaqar.storage.pipeline
|
||||||
|
@ -15,7 +15,8 @@
|
|||||||
|
|
||||||
"""Middleware for handling authorization and authentication."""
|
"""Middleware for handling authorization and authentication."""
|
||||||
|
|
||||||
from keystoneclient.middleware import auth_token
|
from keystonemiddleware import auth_token
|
||||||
|
from keystonemiddleware import opts
|
||||||
|
|
||||||
from zaqar.openstack.common import log
|
from zaqar.openstack.common import log
|
||||||
|
|
||||||
@ -31,10 +32,17 @@ class KeystoneAuth(object):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _register_opts(cls, conf):
|
def _register_opts(cls, conf):
|
||||||
"""Register keystoneclient middleware options."""
|
"""Register keystonemiddleware options."""
|
||||||
|
|
||||||
|
options = []
|
||||||
|
keystone_opts = opts.list_auth_token_opts()
|
||||||
|
for n in keystone_opts:
|
||||||
|
if (n[0] == cls.OPT_GROUP_NAME):
|
||||||
|
options = n[1]
|
||||||
|
break
|
||||||
|
|
||||||
if cls.OPT_GROUP_NAME not in conf:
|
if cls.OPT_GROUP_NAME not in conf:
|
||||||
conf.register_opts(auth_token.opts, group=cls.OPT_GROUP_NAME)
|
conf.register_opts(options, group=cls.OPT_GROUP_NAME)
|
||||||
auth_token.CONF = conf
|
auth_token.CONF = conf
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
@ -18,7 +18,7 @@ import uuid
|
|||||||
|
|
||||||
import falcon
|
import falcon
|
||||||
from falcon import testing
|
from falcon import testing
|
||||||
from keystoneclient.middleware import auth_token
|
from keystonemiddleware import auth_token
|
||||||
|
|
||||||
from zaqar.tests.queues.transport.wsgi import base
|
from zaqar.tests.queues.transport.wsgi import base
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ import uuid
|
|||||||
|
|
||||||
import falcon
|
import falcon
|
||||||
from falcon import testing
|
from falcon import testing
|
||||||
from keystoneclient.middleware import auth_token
|
from keystonemiddleware import auth_token
|
||||||
|
|
||||||
from zaqar.tests.queues.transport.wsgi import base
|
from zaqar.tests.queues.transport.wsgi import base
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user