openstack/watcher
Code Issues Proposed changes

Merge "Update auth_uri option to www_authenticate_uri"

Browse Source
This commit is contained in:
Zuul 2018-04-16 02:16:26 +00:00 committed by Gerrit Code Review
commit d42a89f70f
4 changed files with 7 additions and 6 deletions
doc/source/install
common_configure.rst
watcher
api
hooks.py
tests
api
test_hooks.py
base.py

2
doc/source/install/common_configure.rst

@ -26,7 +26,7 @@
[keystone_authtoken] [keystone_authtoken]
... ...
auth_uri = http://controller:5000 www_authenticate_uri = http://controller:5000
auth_url = http://controller:35357 auth_url = http://controller:35357
memcached_servers = controller:11211 memcached_servers = controller:11211
auth_type = password auth_type = password

2
watcher/api/hooks.py

@ -63,7 +63,7 @@ class ContextHook(hooks.PecanHook):
auth_url = headers.get('X-Auth-Url') auth_url = headers.get('X-Auth-Url')
if auth_url is None: if auth_url is None:
importutils.import_module('keystonemiddleware.auth_token') importutils.import_module('keystonemiddleware.auth_token')
auth_url = cfg.CONF.keystone_authtoken.auth_uri auth_url = cfg.CONF.keystone_authtoken.www_authenticate_uri
state.request.context = context.make_context( state.request.context = context.make_context(
auth_token=auth_token, auth_token=auth_token,

6
watcher/tests/api/test_hooks.py

@ -222,7 +222,7 @@ class TestContextHook(base.FunctionalTest):
user_id=headers['X-User-Id'], user_id=headers['X-User-Id'],
domain_id=headers['X-User-Domain-Id'], domain_id=headers['X-User-Domain-Id'],
domain_name=headers['X-User-Domain-Name'], domain_name=headers['X-User-Domain-Name'],
auth_url=cfg.CONF.keystone_authtoken.auth_uri, auth_url=cfg.CONF.keystone_authtoken.www_authenticate_uri,
project=headers['X-Project-Name'], project=headers['X-Project-Name'],
project_id=headers['X-Project-Id'], project_id=headers['X-Project-Id'],
show_deleted=None, show_deleted=None,
@ -243,7 +243,7 @@ class TestContextHook(base.FunctionalTest):
user_id=headers['X-User-Id'], user_id=headers['X-User-Id'],
domain_id=headers['X-User-Domain-Id'], domain_id=headers['X-User-Domain-Id'],
domain_name=headers['X-User-Domain-Name'], domain_name=headers['X-User-Domain-Name'],
auth_url=cfg.CONF.keystone_authtoken.auth_uri, auth_url=cfg.CONF.keystone_authtoken.www_authenticate_uri,
project=headers['X-Project-Name'], project=headers['X-Project-Name'],
project_id=headers['X-Project-Id'], project_id=headers['X-Project-Id'],
show_deleted=None, show_deleted=None,
@ -265,7 +265,7 @@ class TestContextHook(base.FunctionalTest):
user_id=headers['X-User-Id'], user_id=headers['X-User-Id'],
domain_id=headers['X-User-Domain-Id'], domain_id=headers['X-User-Domain-Id'],
domain_name=headers['X-User-Domain-Name'], domain_name=headers['X-User-Domain-Name'],
auth_url=cfg.CONF.keystone_authtoken.auth_uri, auth_url=cfg.CONF.keystone_authtoken.www_authenticate_uri,
project=headers['X-Project-Name'], project=headers['X-Project-Name'],
project_id=headers['X-Project-Id'], project_id=headers['X-Project-Id'],
show_deleted=None, show_deleted=None,

3
watcher/tests/base.py

@ -60,7 +60,8 @@ class TestCase(BaseTestCase):
cfg.CONF.set_override("auth_type", "admin_token", cfg.CONF.set_override("auth_type", "admin_token",
group='keystone_authtoken') group='keystone_authtoken')
cfg.CONF.set_override("auth_uri", "http://127.0.0.1/identity", cfg.CONF.set_override("www_authenticate_uri",
"http://127.0.0.1/identity",
group='keystone_authtoken') group='keystone_authtoken')
app_config_path = os.path.join(os.path.dirname(__file__), 'config.py') app_config_path = os.path.join(os.path.dirname(__file__), 'config.py')