--extra-vars option for ansible-playbook

Conflicts:

	lib/ansible/playbook.py

Removed unneccessary shlex and replaced with basic split, some repurcussions in runner
that can be eliminated once we consistently pass args as a string (soon).
This commit is contained in:
Michael DeHaan
2012-03-30 22:28:10 -04:00
parent 6db87a5018
commit f11de2f5c9
4 changed files with 51 additions and 15 deletions

View File

@@ -37,6 +37,8 @@ def main(args):
help='set the number of forks to start up')
parser.add_option("-i", "--inventory-file", dest="inventory",
help="inventory host file", default=C.DEFAULT_HOST_LIST)
parser.add_option('-e', '--extra-vars', dest='extra_vars',
help='arguments to pass to the inventory script')
parser.add_option("-k", "--ask-pass", default=False, action="store_true",
help="ask for SSH password")
parser.add_option("-M", "--module-path", dest="module_path",
@@ -71,6 +73,7 @@ def main(args):
pb = ansible.playbook.PlayBook(
playbook=playbook,
host_list=options.inventory,
extra_vars=options.extra_vars,
module_path=options.module_path,
forks=options.forks,
verbose=True,