Merge "[train-only] Inventory doesn't contain admin password" into stable/train
This commit is contained in:
commit
f86ae3f2a5
|
@ -62,11 +62,15 @@ def get_auth_session(auth_variables):
|
||||||
|
|
||||||
|
|
||||||
def get_swift_client(auth_variables):
|
def get_swift_client(auth_variables):
|
||||||
return Connection(authurl=auth_variables.get('auth_url'),
|
password = auth_variables.get('password')
|
||||||
user=auth_variables.get('username'),
|
if password:
|
||||||
key=auth_variables.get('password'),
|
return Connection(authurl=auth_variables.get('auth_url'),
|
||||||
auth_version='3',
|
user=auth_variables.get('username'),
|
||||||
tenant_name=auth_variables.get('project_name'))
|
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):
|
def get_nova_client(auth_variables):
|
||||||
|
|
Loading…
Reference in New Issue