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

Support multiple --extra-vars flags

Browse source
This commit is contained in:
Alek Storm 2013-08-21 17:12:42 -07:00 committed by James Cammarata
parent af4f0bd008
commit 21d2069a74
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
bin/ansible-playbook
View file

@ -61,8 +61,8 @@ def main(args):
check_opts=True,
diff_opts=True
)
parser.add_option('-e', '--extra-vars', dest="extra_vars", default=None,
help="set additional key=value variables from the CLI")
parser.add_option('-e', '--extra-vars', dest="extra_vars", action="append",
help="set additional variables as key=value or JSON", default=[])
parser.add_option('-t', '--tags', dest='tags', default='all',
help="only run plays and tasks tagged with these values")
parser.add_option('--skip-tags', dest='skip_tags',
@ -99,17 +99,17 @@ def main(args):
options.sudo_user = options.sudo_user or C.DEFAULT_SUDO_USER
extra_vars = {}
if options.extra_vars:
if options.extra_vars.startswith("@"):
for extra_vars_opt in options.extra_vars:
if extra_vars_opt.startswith("@"):
# Argument is a JSON file
with open(options.extra_vars[1:]) as fd:
extra_vars = utils.json_loads(fd.read())
elif options.extra_vars[0] in '[{':
with open(extra_vars_opt[1:]) as fd:
extra_vars = utils.combine_vars(extra_vars, utils.json_loads(fd.read()))
elif extra_vars_opt[0] in '[{':
# Arguments as JSON
extra_vars = utils.json_loads(options.extra_vars)
extra_vars = utils.combine_vars(extra_vars, utils.json_loads(extra_vars_opt))
else:
# Arguments as Key-value
extra_vars = utils.parse_kv(options.extra_vars)
extra_vars = utils.combine_vars(extra_vars, utils.parse_kv(extra_vars_opt))
only_tags = options.tags.split(",")
skip_tags = options.skip_tags