openstack
/
tripleo-validations
Code Issues Proposed changes

Merge "[train-only] Inventory doesn't contain admin password" into stable/train

This commit is contained in:
Zuul 2021-05-31 10:33:47 +00:00 committed by Gerrit Code Review
parent 11218833e5 386f41de04
commit f86ae3f2a5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tripleo_validations/utils.py
View File

@ -62,11 +62,15 @@ def get_auth_session(auth_variables):
def get_swift_client(auth_variables):
return Connection(authurl=auth_variables.get('auth_url'),
user=auth_variables.get('username'),
key=auth_variables.get('password'),
auth_version='3',
tenant_name=auth_variables.get('project_name'))
password = auth_variables.get('password')
if password:
return Connection(authurl=auth_variables.get('auth_url'),
user=auth_variables.get('username'),
key=password,
auth_version='3',
tenant_name=auth_variables.get('project_name'))
return Connection(preauthurl=auth_variables.get('undercloud_swift_url'),
preauthtoken=auth_variables.get('os_auth_token'))
def get_nova_client(auth_variables):