x/tobiko
Code Issues Proposed changes

Merge "Raise NoSuchKeystoneCredentials when credentials files are not found"

Browse Source
This commit is contained in:
Zuul 2022-08-08 14:41:19 +00:00 committed by Gerrit Code Review
commit fb0d57e810
1 changed files with 5 additions and 4 deletions

9
tobiko/tripleo/_undercloud.py

@ -63,7 +63,7 @@ def fetch_os_env(rcfile: str, *rcfiles: str) -> typing.Dict[str, str]:
except sh.ShellCommandFailed as ex: except sh.ShellCommandFailed as ex:
LOG.debug(f"Unable to get overcloud RC file '{rcfile}' content " LOG.debug(f"Unable to get overcloud RC file '{rcfile}' content "
f"({ex})") f"({ex})")
errors.append(tobiko.exc_info) errors.append(ex)
else: else:
LOG.debug(f'Parsing environment variables from: {rcfile}...') LOG.debug(f'Parsing environment variables from: {rcfile}...')
env = {} env = {}
@ -75,9 +75,10 @@ def fetch_os_env(rcfile: str, *rcfiles: str) -> typing.Dict[str, str]:
LOG.debug(f'Environment variables read from: {rcfile}:\n' LOG.debug(f'Environment variables read from: {rcfile}:\n'
f'{env_dump}') f'{env_dump}')
return env return env
for error in errors: if errors and all("No such file or directory" in error.stderr
LOG.exception(f"Unable to get overcloud RC file '{rcfile}' " for error in errors):
"content", exc_info=error) LOG.warning('None of the credentials files were found')
raise keystone.NoSuchKeystoneCredentials()
raise InvalidRCFile(rcfile=", ".join(rcfiles)) raise InvalidRCFile(rcfile=", ".join(rcfiles))