From 5a4d4bc051a237c37ee3ba921db2fec818cfec90 Mon Sep 17 00:00:00 2001 From: Brad Olson Date: Tue, 10 Apr 2012 15:17:25 +0000 Subject: [PATCH] Added usage info to bin/ansible-playbook, now shows options on bare command line. NOTE: bin/ansible outputs usage to stdout, bin/ansible-playbook to stderr. Should they be consistent? --- bin/ansible-playbook | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/ansible-playbook b/bin/ansible-playbook index 955888b2ece..7badfb65cec 100755 --- a/bin/ansible-playbook +++ b/bin/ansible-playbook @@ -32,7 +32,7 @@ def main(args): ''' run ansible-playbook operations ''' # create parser for CLI options - usage = "%prog playbook.yml [options]" + usage = "%prog [options]" options = { '-e' : dict(long='--extra-vars', dest='extra_vars', help='pass in extra key=value variables from outside the playbook'), @@ -43,7 +43,9 @@ def main(args): options, args = parser.parse_args(args) if len(args) == 0: - print >> sys.stderr, "playbook path is a required argument" + parser.print_help(file=sys.stderr) + #QUESTION for M.D. This would match bin/ansible's behavior. Do we want them consistent? + #parser.print_help() return 1 sshpass = None