internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 21:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing more v2 issues with integration tests

Browse Source
This commit is contained in:
James Cammarata
2015-01-26 23:41:02 -06:00
parent 6f5d18a20e
commit bbd08cd0e2
7 changed files with 58 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
v2/bin/ansible-playbook
View File

@@ -108,15 +108,13 @@ def main(args):
if extra_vars_opt.startswith("@"):
# Argument is a YAML file (JSON is a subset of YAML)
data = loader.load_from_file(extra_vars_opt[1:])
extra_vars = combine_vars(extra_vars, data)
elif extra_vars_opt and extra_vars_opt[0] in '[{':
# Arguments as YAML
data = loader.load(extra_vars)
extra_vars = combine_vars(extra_vars, data)
data = loader.load(extra_vars_opt)
else:
# Arguments as Key-value
data = parse_kv(extra_vars_opt)
extra_vars = combine_vars(extra_vars, data)
extra_vars = combine_vars(extra_vars, data)
# FIXME: this should be moved inside the playbook executor code
only_tags = options.tags.split(",")