wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3040 from bfabio/devel

Browse source 
Support JSON in --extra-vars.
This commit is contained in:
Michael DeHaan 2013-05-31 13:06:05 -07:00
commit 0837c9785f
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bin/ansible-playbook
View file

@ -98,7 +98,10 @@ def main(args):
if options.sudo_user or options.ask_sudo_pass:
options.sudo = True
options.sudo_user = options.sudo_user or C.DEFAULT_SUDO_USER
extra_vars = utils.parse_kv(options.extra_vars)
if options.extra_vars[0] in '[{':
extra_vars = utils.json_loads(options.extra_vars)
else:
extra_vars = utils.parse_kv(options.extra_vars)
only_tags = options.tags.split(",")
for playbook in args:

3
docs/man/man1/ansible-playbook.1.asciidoc.in
View file

@ -53,7 +53,8 @@ environment variable.
*-e* 'VARS', *--extra-vars=*'VARS'::
Extra variables to inject into a playbook, in key=value key=value format.
Extra variables to inject into a playbook, in key=value key=value format or
as JSON (objects and arrays).
*-f* 'NUM', *--forks=*'NUM'::