From 13914815239d6c0291146566dfe0f04a55dc909c Mon Sep 17 00:00:00 2001 From: Stephen Fromm Date: Tue, 10 Apr 2012 16:13:18 -0700 Subject: [PATCH] Add support for -c, --connection argument to specify connection type Adds support to specify connection type to use. The option -c, --connection is added when connect_opts is set to True. connect_opts is added to make_parser() and base_parser_options(). --- lib/ansible/utils.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/ansible/utils.py b/lib/ansible/utils.py index 5eb5d07e5d0..fa13120922e 100755 --- a/lib/ansible/utils.py +++ b/lib/ansible/utils.py @@ -273,14 +273,15 @@ def parse_kv(args): options[k]=v return options -def make_parser(add_options, constants=C, usage="", output_opts=False, runas_opts=False, async_opts=False): +def make_parser(add_options, constants=C, usage="", output_opts=False, runas_opts=False, async_opts=False, connect_opts=False): ''' create an options parser w/ common options for any ansible program ''' options = base_parser_options( constants=constants, output_opts=output_opts, runas_opts=runas_opts, - async_opts=async_opts + async_opts=async_opts, + connect_opts=connect_opts ) options.update(add_options) @@ -293,7 +294,7 @@ def make_parser(add_options, constants=C, usage="", output_opts=False, runas_opt parser.add_option(n, long, **data) return parser -def base_parser_options(constants=C, output_opts=False, runas_opts=False, async_opts=False): +def base_parser_options(constants=C, output_opts=False, runas_opts=False, async_opts=False, connect_opts=False): ''' creates common options for ansible programs ''' options = { @@ -329,6 +330,14 @@ def base_parser_options(constants=C, output_opts=False, runas_opts=False, async_ dest='remote_user', help='connect as this user'), }) + if connect_opts: + options.update({ + '-c' : dict(long='--connection', dest='connection', + choices=C.DEFAULT_TRANSPORT_OPTS, + default=C.DEFAULT_TRANSPORT, + help="connection type to use") + }) + if async_opts: options.update({ '-P' : dict(long='--poll', default=constants.DEFAULT_POLL_INTERVAL, type='int',