From ab17f6f44e8fc3c15549b6ff4b5c752ef1a79bd9 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Tue, 28 Feb 2012 02:38:36 -0500 Subject: [PATCH] Because I can't remember which options are supposed to be uppercase and which are not, rename all of them so we can use non-conflicting lowercase. Manpage updates pending --- bin/ans-command | 4 ++-- lib/ansible/scripts.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/ans-command b/bin/ans-command index a09f299787c..19b8cf6b26a 100755 --- a/bin/ans-command +++ b/bin/ans-command @@ -37,10 +37,10 @@ def main(args): parser = base_ans_parser() parser.usage = "ans-command [options] command-to-run" - parser.add_option('-1', '--one-line', dest='one_line', action='store_true', + parser.add_option('-o', '--one-line', dest='one_line', action='store_true', help="output results on one line to make grepping easier, however will \ not remove newlines from command output") - parser.add_option('-o', '--output-dir', dest='output_dest', default=None, + parser.add_option('-t', '--tree', dest='output_dest', default=None, help="if specified, a directory name to save output to, one file per host") options, args = parser.parse_args(args) diff --git a/lib/ansible/scripts.py b/lib/ansible/scripts.py index 28d8cec4f2e..b6c5ad2bfa6 100644 --- a/lib/ansible/scripts.py +++ b/lib/ansible/scripts.py @@ -20,15 +20,15 @@ import constants as C def base_ans_parser(): parser = OptionParser() - parser.add_option("-H", "--host-list", dest="host_list", + parser.add_option("-l", "--host-list", dest="host_list", help="path to hosts list", default=C.DEFAULT_HOST_LIST) - parser.add_option("-L", "--library", dest="module_path", + parser.add_option("-m", "--module-path", dest="module_path", help="path to module library", default=C.DEFAULT_MODULE_PATH) parser.add_option('-u', '--user', default=C.DEFAULT_REMOTE_USER, dest='remote_user', help='set the default username') parser.add_option("-p", "--pattern", dest="pattern", help="hostname pattern", default=C.DEFAULT_PATTERN) - parser.add_option("-P", "--askpass", default=False, action="store_true", + parser.add_option("-k", "--askpass", default=False, action="store_true", help="ask the user to input the ssh password for connecting") parser.add_option('-f','--forks', dest='forks', default=C.DEFAULT_FORKS, type='int', help='set the number of forks to start up')