openstack/zun
Code Issues Proposed changes

Update auth_uri option to www_authenticate_uri

Browse Source 
Option auth_uri from group keystone_authtoken is deprecated[1].
Use option www_authenticate_uri from group keystone_authtoken.

[1]https://review.openstack.org/#/c/508522/

Change-Id: Ib6b29f53911e83c64945993f4d107eb20d2a56a9
This commit is contained in:
caoyuan 2018-04-11 22:54:31 +08:00 committed by Hongbin Lu
parent ded1103766
commit a56a82e01d
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/zun
View File

@ -208,7 +208,7 @@ function create_zun_conf {
configure_auth_token_middleware $ZUN_CONF zun $ZUN_AUTH_CACHE_DIR configure_auth_token_middleware $ZUN_CONF zun $ZUN_AUTH_CACHE_DIR
iniset $ZUN_CONF keystone_auth auth_url $KEYSTONE_AUTH_URI_V3 iniset $ZUN_CONF keystone_auth auth_url $KEYSTONE_AUTH_URI_V3
iniset $ZUN_CONF keystone_authtoken auth_uri $KEYSTONE_SERVICE_URI_V3 iniset $ZUN_CONF keystone_authtoken www_authenticate_uri $KEYSTONE_SERVICE_URI_V3
iniset $ZUN_CONF keystone_authtoken auth_url $KEYSTONE_AUTH_URI_V3 iniset $ZUN_CONF keystone_authtoken auth_url $KEYSTONE_AUTH_URI_V3
iniset $ZUN_CONF keystone_authtoken auth_version v3 iniset $ZUN_CONF keystone_authtoken auth_version v3

4
doc/source/install/compute-install-ubuntu.rst
View File

@ -110,7 +110,7 @@ Install and configure components
[keystone_auth] [keystone_auth]
memcached_servers = controller:11211 memcached_servers = controller:11211
auth_uri = http://controller:5000 www_authenticate_uri = http://controller:5000
project_domain_name = default project_domain_name = default
project_name = service project_name = service
user_domain_name = default user_domain_name = default
@ -132,7 +132,7 @@ Install and configure components
[keystone_authtoken] [keystone_authtoken]
... ...
memcached_servers = controller:11211 memcached_servers = controller:11211
auth_uri = http://controller:5000 www_authenticate_uri= http://controller:5000
project_domain_name = default project_domain_name = default
project_name = service project_name = service
user_domain_name = default user_domain_name = default

4
doc/source/install/controller-install-ubuntu.rst
View File

@ -237,7 +237,7 @@ Install and configure components
[keystone_auth] [keystone_auth]
memcached_servers = controller:11211 memcached_servers = controller:11211
auth_uri = http://controller:5000 www_authenticate_uri = http://controller:5000
project_domain_name = default project_domain_name = default
project_name = service project_name = service
user_domain_name = default user_domain_name = default
@ -259,7 +259,7 @@ Install and configure components
[keystone_authtoken] [keystone_authtoken]
... ...
memcached_servers = controller:11211 memcached_servers = controller:11211
auth_uri = http://controller:5000 www_authenticate_uri = http://controller:5000
project_domain_name = default project_domain_name = default
project_name = service project_name = service
user_domain_name = default user_domain_name = default

2
zun/api/hooks.py
View File

@ -58,7 +58,7 @@ class ContextHook(hooks.PecanHook):
roles = headers.get('X-Roles', '').split(',') roles = headers.get('X-Roles', '').split(',')
auth_token_info = state.request.environ.get('keystone.token_info') auth_token_info = state.request.environ.get('keystone.token_info')
auth_url = CONF.keystone_authtoken.auth_uri auth_url = 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,

3
zun/common/keystone.py
View File

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

2
zun/conf/keystone.py
View File

@ -25,7 +25,7 @@ def register_opts(conf):
ka_loading.register_auth_conf_options(conf, CFG_GROUP) ka_loading.register_auth_conf_options(conf, CFG_GROUP)
ka_loading.register_session_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.set_default('auth_type', default='password', group=CFG_GROUP)
conf.import_opt('auth_uri', 'keystonemiddleware.auth_token', conf.import_opt('www_authenticate_uri', 'keystonemiddleware.auth_token',
group=CFG_LEGACY_GROUP) group=CFG_LEGACY_GROUP)

3
zun/tests/unit/common/test_clients.py
View File

@ -25,7 +25,8 @@ class ClientsTest(base.BaseTestCase):
def setUp(self): def setUp(self):
super(ClientsTest, self).setUp() super(ClientsTest, self).setUp()
zun.conf.CONF.set_override('auth_uri', 'http://server.test:5000/v2.0', zun.conf.CONF.set_override('www_authenticate_uri',
'http://server.test:5000/v2.0',
group='keystone_authtoken') group='keystone_authtoken')
zun.conf.CONF.import_opt('api_version', 'zun.conf.glance_client', zun.conf.CONF.import_opt('api_version', 'zun.conf.glance_client',
group='glance_client') group='glance_client')