openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "[Validator Run] Don't rely on parameter file extension" into stable/ussuri

This commit is contained in:
Zuul 2020-11-06 20:37:16 +00:00 committed by Gerrit Code Review
parent 2a92971947 6005878b4f
commit 2120de8d26
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tripleoclient/v1/tripleo_validator.py
View File

@ -320,11 +320,14 @@ class TripleOValidatorRun(command.Command):
limit = parsed_args.limit
extra_vars = parsed_args.extra_vars
if parsed_args.extra_vars_file:
with open(parsed_args.extra_vars_file, 'r') as env_file:
if '.json' in parsed_args.extra_vars_file:
extra_vars.update(json.load(env_file))
else:
extra_vars.update(yaml.load(env_file))
try:
with open(parsed_args.extra_vars_file, 'r') as env_file:
extra_vars.update(yaml.safe_load(env_file.read()))
except yaml.YAMLError as e:
error_msg = (
"The request body must be properly formatted YAML/JSON. "
"Details: %s." % e)
raise exceptions.CommandError(error_msg)
# We don't check if the file exists in order to support
# passing a string such as "localhost,", like we can do with