x
/
cloudpulse
Code Issues Proposed changes

Fixing Keystone to use auth_url for version discovery 

Change-Id: I9935a5070d9c1a11eede88538015c94dcdb49186
This commit is contained in:
Anand Shanmugam 2016-10-18 04:41:03 -07:00
parent 6237884f36
commit e96e57cbdd
1 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cloudpulse/openstack/api/keystone_session.py
View File

@ -28,10 +28,10 @@ def _get_kssession():
kwargs = {'auth_url': cfg.CONF.keystone_authtoken.auth_uri,
'username': cfg.CONF.keystone_authtoken.username,
'password': cfg.CONF.keystone_authtoken.password}
if cfg.CONF.keystone_authtoken.auth_version == '2':
if cfg.CONF.keystone_authtoken.auth_uri[-3:] == '2.0':
client = v2_client
kwargs['tenant_name'] = cfg.CONF.keystone_authtoken.project_name
elif cfg.CONF.keystone_authtoken.auth_version == '3':
elif cfg.CONF.keystone_authtoken.auth_uri[-1:] == '3':
client = v3_client
kwargs['project_name'] = cfg.CONF.keystone_authtoken.project_name
kwargs['user_domain_id'] = cfg.CONF.keystone_authtoken.user_domain_id