parent
6d788629a2
commit
1ed1af6cb4
1 changed files with 4 additions and 2 deletions
|
@ -13,6 +13,7 @@ from ansible.parsing.splitter import parse_kv
|
|||
from ansible.playbook import Playbook
|
||||
from ansible.playbook.task import Task
|
||||
from ansible.utils.cli import base_parser
|
||||
from ansible.utils.unicode import to_unicode
|
||||
from ansible.utils.vars import combine_vars
|
||||
from ansible.vars import VariableManager
|
||||
|
||||
|
@ -105,10 +106,11 @@ def main(args):
|
|||
|
||||
extra_vars = {}
|
||||
for extra_vars_opt in options.extra_vars:
|
||||
if extra_vars_opt.startswith("@"):
|
||||
extra_vars_opt = to_unicode(extra_vars_opt)
|
||||
if extra_vars_opt.startswith(u"@"):
|
||||
# Argument is a YAML file (JSON is a subset of YAML)
|
||||
data = loader.load_from_file(extra_vars_opt[1:])
|
||||
elif extra_vars_opt and extra_vars_opt[0] in '[{':
|
||||
elif extra_vars_opt and extra_vars_opt[0] in u'[{':
|
||||
# Arguments as YAML
|
||||
data = loader.load(extra_vars_opt)
|
||||
else:
|
||||
|
|
Loading…
Reference in a new issue