openstack
/
zun
Code Issues Proposed changes

Merge "Fall back to the legacy auth_uri option"

This commit is contained in:
Zuul 2018-07-10 03:42:43 +00:00 committed by Gerrit Code Review
parent d42a559f16 cc0f66218f
commit f9e4b30a95
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zun/common/keystone.py
View File

@ -38,8 +38,9 @@ class KeystoneClientV3(object):
def auth_url(self):
# FIXME(pauloewerton): auth_url should be retrieved from keystone_auth
# section by default
return CONF[ksconf.CFG_LEGACY_GROUP].www_authenticate_uri.replace(
'v2.0', 'v3')
url = CONF[ksconf.CFG_LEGACY_GROUP].www_authenticate_uri or \
CONF[ksconf.CFG_LEGACY_GROUP].auth_uri
return url.replace('v2.0', 'v3')
@property
def auth_token(self):

2
zun/conf/keystone.py
View File

@ -25,8 +25,6 @@ def register_opts(conf):
ka_loading.register_auth_conf_options(conf, CFG_GROUP)
ka_loading.register_session_conf_options(conf, CFG_GROUP)
conf.set_default('auth_type', default='password', group=CFG_GROUP)
conf.import_opt('www_authenticate_uri', 'keystonemiddleware.auth_token',
group=CFG_LEGACY_GROUP)
def list_opts():