ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Minor option string relabelling, move one option from common into helper script

Browse source
This commit is contained in:
Michael DeHaan 2012-02-28 01:01:44 -05:00
parent c6eb3f1006
commit fb531a8dfa
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bin/ans-command
View file

@ -29,17 +29,23 @@ from ansible.scripts import base_ans_parser, error_print
def main(args):
parser = base_ans_parser(output_path=False)
parser.usage = "ans-command [options] command-to-run"
parser.add_option('-c', '--return-codes', dest='return_codes', action='store_true',
help="prefix each line with the commands returncode")
help="prefix each line with the command's return code")
parser.add_option('-1', '--one-line', dest='one_line', action='store_true',
help="output all things as one line - to make grepping easier, will \
not remove \\n's from output of commands, though")
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,
help="output each host's results to a file in a dir named for the host")
parser.add_option('--output-path', default='/tmp/ansible', dest="output_path",
help="basepath to store results/errors output.")
options, args = parser.parse_args(args)
# TODO: move into lib/ansible/scripts.py
sshpass = None
if options.askpass:
sshpass = getpass.getpass(prompt="SSH password: ")
@ -79,7 +85,6 @@ def main(args):
verbose=True,
)
print mycmd
results = runner.run()
for hn in sorted(results['contacted']):

10
lib/ansible/scripts.py
View file

@ -18,11 +18,8 @@ from optparse import OptionParser
import sys
import constants as C
def base_ans_parser(opthosts=True, output_path=True, forkdef=C.DEFAULT_FORKS):
def base_ans_parser():
parser = OptionParser()
if opthosts:
parser.add_option('--host', default=[], action='append',
help="hosts to act on, defaults to ALL")
parser.add_option("-H", "--host-list", dest="host_list",
help="path to hosts list", default=C.DEFAULT_HOST_LIST)
parser.add_option("-L", "--library", dest="module_path",
@ -31,11 +28,8 @@ def base_ans_parser(opthosts=True, output_path=True, forkdef=C.DEFAULT_FORKS):
dest='remote_user', help='set the default username')
parser.add_option("-P", "--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=forkdef, type='int',
parser.add_option('-f','--forks', dest='forks', default=C.DEFAULT_FORKS, type='int',
help='set the number of forks to start up')
if output_path:
parser.add_option('--output-path', default='/tmp/ansible', dest="output_path",
help="basepath to store results/errors output.")
return parser
# other functions as needed for nicely handling output from json back