Merge pull request #3040 from bfabio/devel

Support JSON in --extra-vars.
pull/3044/merge
Michael DeHaan 12 years ago
commit 0837c9785f

@ -98,7 +98,10 @@ def main(args):
if options.sudo_user or options.ask_sudo_pass: if options.sudo_user or options.ask_sudo_pass:
options.sudo = True options.sudo = True
options.sudo_user = options.sudo_user or C.DEFAULT_SUDO_USER 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(",") only_tags = options.tags.split(",")
for playbook in args: for playbook in args:

@ -53,7 +53,8 @@ environment variable.
*-e* 'VARS', *--extra-vars=*'VARS':: *-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':: *-f* 'NUM', *--forks=*'NUM'::

Loading…
Cancel
Save