openstack/zaqar
Code Issues Proposed changes

Merge "Use auth_token from keystonemiddleware"

Browse Source
This commit is contained in:
Jenkins 2014-08-12 14:03:48 +00:00 committed by Gerrit Code Review
commit dc6936f539
7 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/marconi.conf.sample
View File

@ -226,7 +226,7 @@
[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

2
requirements-py3.txt
View File

@ -5,10 +5,10 @@ netaddr>=0.7.6
falcon>=0.1.6,<0.2.0
jsonschema>=2.0.0,<3.0.0
iso8601>=0.1.9
keystonemiddleware>=1.0.0
msgpack-python>=0.4.0
posix_ipc
pymongo>=2.5
python-keystoneclient>=0.10.0
# python-memcached has no Py3k support for now
# python-memcached>=1.48
WebOb>=1.2.3

2
requirements.txt
View File

@ -5,10 +5,10 @@ netaddr>=0.7.6
falcon>=0.1.6,<0.2.0
jsonschema>=2.0.0,<3.0.0
iso8601>=0.1.9
keystonemiddleware>=1.0.0
msgpack-python>=0.4.0
posix_ipc
pymongo>=2.5
python-keystoneclient>=0.10.0
python-memcached>=1.48
WebOb>=1.2.3
stevedore>=0.14

2
tools/config/oslo.config.generator.rc
View File

@ -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
zaqar.storage.base
zaqar.storage.pipeline

14
zaqar/queues/transport/auth.py
View File

@ -15,7 +15,8 @@
"""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
@ -31,10 +32,17 @@ class KeystoneAuth(object):
@classmethod
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:
conf.register_opts(auth_token.opts, group=cls.OPT_GROUP_NAME)
conf.register_opts(options, group=cls.OPT_GROUP_NAME)
auth_token.CONF = conf
@classmethod

2
zaqar/tests/queues/transport/wsgi/v1/test_auth.py
View File

@ -18,7 +18,7 @@ import uuid
import falcon
from falcon import testing
from keystoneclient.middleware import auth_token
from keystonemiddleware import auth_token
from zaqar.tests.queues.transport.wsgi import base

2
zaqar/tests/queues/transport/wsgi/v1_1/test_auth.py
View File

@ -18,7 +18,7 @@ import uuid
import falcon
from falcon import testing
from keystoneclient.middleware import auth_token
from keystonemiddleware import auth_token
from zaqar.tests.queues.transport.wsgi import base