x
/
kloudbuster
Code Issues Proposed changes

Fix KloudBuster to support recent keystone v3 change 

Change-Id: Ief815a28effea6fcf899cee4bd762c6a3313ff01
This commit is contained in:
Yichen Wang 2017-02-13 17:47:28 -08:00
parent 622a3d6cab
commit 48b43ac460
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kloudbuster/credentials.py
View File

@ -32,8 +32,8 @@ class Credentials(object):
dct['auth_url'] = self.rc_auth_url
if self.rc_identity_api_version == 3:
dct['project_name'] = self.rc_project_name
dct['project_domain_id'] = self.rc_project_domain_id
dct['user_domain_id'] = self.rc_user_domain_id
dct['project_domain_name'] = self.rc_project_domain_name
dct['user_domain_name'] = self.rc_user_domain_name
else:
dct['tenant_name'] = self.rc_tenant_name
return dct
@ -75,10 +75,10 @@ class Credentials(object):
self.rc_password = value
elif name == "PROJECT_NAME":
self.rc_project_name = value
elif name == "PROJECT_DOMAIN_ID" or name == "PROJECT_DOMAIN_NAME":
self.rc_project_domain_id = value
elif name == "USER_DOMAIN_ID" or name == "USER_DOMAIN_NAME":
self.rc_user_domain_id = value
elif name == "PROJECT_DOMAIN_NAME":
self.rc_project_domain_name = value
elif name == "USER_DOMAIN_NAME":
self.rc_user_domain_name = value
# Read a openrc file and take care of the password
# The 2 args are passed from the command line and can be None
@ -90,8 +90,8 @@ class Credentials(object):
self.rc_cacert = False
self.rc_region_name = None
self.rc_project_name = None
self.rc_project_domain_id = None
self.rc_user_domain_id = None
self.rc_project_domain_name = None
self.rc_user_domain_name = None
self.rc_identity_api_version = 2
self.openrc_contents = openrc_contents
success = True
@ -128,7 +128,7 @@ class Credentials(object):
elif self.rc_identity_api_version == 3:
for varname in ['OS_USERNAME', 'OS_AUTH_URL', 'OS_PROJECT_NAME',
'OS_PROJECT_DOMAIN_ID', 'OS_USER_DOMAIN_ID']:
'OS_PROJECT_DOMAIN_NAME', 'OS_USER_DOMAIN_NAME']:
if varname not in os.environ:
LOG.warning('%s is missing', varname)
success = False
@ -136,8 +136,8 @@ class Credentials(object):
self.rc_username = os.environ['OS_USERNAME']
self.rc_auth_url = os.environ['OS_AUTH_URL']
self.rc_project_name = os.environ['OS_PROJECT_NAME']
self.rc_project_domain_id = os.environ['OS_PROJECT_DOMAIN_ID']
self.rc_user_domain_id = os.environ['OS_USER_DOMAIN_ID']
self.rc_project_domain_name = os.environ['OS_PROJECT_DOMAIN_NAME']
self.rc_user_domain_name = os.environ['OS_USER_DOMAIN_NAME']
if 'OS_CACERT' in os.environ:
self.rc_cacert = os.environ['OS_CACERT']