mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
add support for using an alternate remote port
This commit is contained in:
parent
9777653741
commit
f06ec76fdb
5 changed files with 17 additions and 10 deletions
|
@ -73,6 +73,8 @@ class Cli(object):
|
||||||
dest='timeout', help="set the SSH timeout in seconds")
|
dest='timeout', help="set the SSH timeout in seconds")
|
||||||
parser.add_option('-u', '--user', default=C.DEFAULT_REMOTE_USER,
|
parser.add_option('-u', '--user', default=C.DEFAULT_REMOTE_USER,
|
||||||
dest='remote_user', help='connect as this user')
|
dest='remote_user', help='connect as this user')
|
||||||
|
parser.add_option('-p', '--port', default=C.DEFAULT_REMOTE_PORT, type='int',
|
||||||
|
dest='remote_port', help='set the remote ssh port')
|
||||||
options, args = parser.parse_args()
|
options, args = parser.parse_args()
|
||||||
self.callbacks.options = options
|
self.callbacks.options = options
|
||||||
|
|
||||||
|
@ -102,7 +104,8 @@ class Cli(object):
|
||||||
module_args=shlex.split(options.module_args),
|
module_args=shlex.split(options.module_args),
|
||||||
remote_user=options.remote_user, remote_pass=sshpass,
|
remote_user=options.remote_user, remote_pass=sshpass,
|
||||||
host_list=options.inventory, timeout=options.timeout,
|
host_list=options.inventory, timeout=options.timeout,
|
||||||
forks=options.forks, background=options.seconds, pattern=pattern,
|
remote_port=options.remote_port, forks=options.forks,
|
||||||
|
background=options.seconds, pattern=pattern,
|
||||||
callbacks=self.callbacks, verbose=True,
|
callbacks=self.callbacks, verbose=True,
|
||||||
)
|
)
|
||||||
return (runner, runner.run())
|
return (runner, runner.run())
|
||||||
|
@ -116,7 +119,8 @@ class Cli(object):
|
||||||
module_args=[ "jid=%s" % jid ], remote_user=old_runner.remote_user,
|
module_args=[ "jid=%s" % jid ], remote_user=old_runner.remote_user,
|
||||||
remote_pass=old_runner.remote_pass, host_list=hosts,
|
remote_pass=old_runner.remote_pass, host_list=hosts,
|
||||||
timeout=old_runner.timeout, forks=old_runner.forks,
|
timeout=old_runner.timeout, forks=old_runner.forks,
|
||||||
pattern='*', callbacks=self.silent_callbacks, verbose=True,
|
remote_port=old_runner.remote_port, pattern='*',
|
||||||
|
callbacks=self.silent_callbacks, verbose=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
# ----------------------------------------------
|
# ----------------------------------------------
|
||||||
|
|
|
@ -65,7 +65,8 @@ class ParamikoConnection(object):
|
||||||
allow_agent=True,
|
allow_agent=True,
|
||||||
look_for_keys=True,
|
look_for_keys=True,
|
||||||
password=self.runner.remote_pass,
|
password=self.runner.remote_pass,
|
||||||
timeout=self.runner.timeout
|
timeout=self.runner.timeout,
|
||||||
|
port=self.runner.remote_port
|
||||||
)
|
)
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
raise errors.AnsibleConnectionFailed(str(e))
|
raise errors.AnsibleConnectionFailed(str(e))
|
||||||
|
|
|
@ -32,5 +32,4 @@ DEFAULT_TIMEOUT = 10
|
||||||
DEFAULT_POLL_INTERVAL = 15
|
DEFAULT_POLL_INTERVAL = 15
|
||||||
DEFAULT_REMOTE_USER = 'root'
|
DEFAULT_REMOTE_USER = 'root'
|
||||||
DEFAULT_REMOTE_PASS = None
|
DEFAULT_REMOTE_PASS = None
|
||||||
|
DEFAULT_REMOTE_PORT = 22
|
||||||
|
|
||||||
|
|
|
@ -54,6 +54,7 @@ class PlayBook(object):
|
||||||
timeout = C.DEFAULT_TIMEOUT,
|
timeout = C.DEFAULT_TIMEOUT,
|
||||||
remote_user = C.DEFAULT_REMOTE_USER,
|
remote_user = C.DEFAULT_REMOTE_USER,
|
||||||
remote_pass = C.DEFAULT_REMOTE_PASS,
|
remote_pass = C.DEFAULT_REMOTE_PASS,
|
||||||
|
remote_port = C.DEFAULT_REMOTE_PORT,
|
||||||
override_hosts = None,
|
override_hosts = None,
|
||||||
verbose = False,
|
verbose = False,
|
||||||
callbacks = None,
|
callbacks = None,
|
||||||
|
@ -69,6 +70,7 @@ class PlayBook(object):
|
||||||
self.timeout = timeout
|
self.timeout = timeout
|
||||||
self.remote_user = remote_user
|
self.remote_user = remote_user
|
||||||
self.remote_pass = remote_pass
|
self.remote_pass = remote_pass
|
||||||
|
self.remote_port = remote_port
|
||||||
self.verbose = verbose
|
self.verbose = verbose
|
||||||
self.callbacks = callbacks
|
self.callbacks = callbacks
|
||||||
self.runner_callbacks = runner_callbacks
|
self.runner_callbacks = runner_callbacks
|
||||||
|
@ -262,7 +264,7 @@ class PlayBook(object):
|
||||||
pattern=pattern, groups=self.groups, module_name=module,
|
pattern=pattern, groups=self.groups, module_name=module,
|
||||||
module_args=args, host_list=hosts, forks=self.forks,
|
module_args=args, host_list=hosts, forks=self.forks,
|
||||||
remote_pass=self.remote_pass, module_path=self.module_path,
|
remote_pass=self.remote_pass, module_path=self.module_path,
|
||||||
timeout=self.timeout, remote_user=remote_user,
|
timeout=self.timeout, remote_user=remote_user, remote_port=self.remote_port,
|
||||||
setup_cache=SETUP_CACHE, basedir=self.basedir,
|
setup_cache=SETUP_CACHE, basedir=self.basedir,
|
||||||
conditional=only_if, callbacks=self.runner_callbacks,
|
conditional=only_if, callbacks=self.runner_callbacks,
|
||||||
)
|
)
|
||||||
|
@ -426,7 +428,7 @@ class PlayBook(object):
|
||||||
pattern=pattern, groups=self.groups, module_name='setup',
|
pattern=pattern, groups=self.groups, module_name='setup',
|
||||||
module_args=push_var_str, host_list=host_list,
|
module_args=push_var_str, host_list=host_list,
|
||||||
forks=self.forks, module_path=self.module_path,
|
forks=self.forks, module_path=self.module_path,
|
||||||
timeout=self.timeout, remote_user=user,
|
timeout=self.timeout, remote_user=user, remote_port=self.remote_port,
|
||||||
remote_pass=self.remote_pass, setup_cache=SETUP_CACHE,
|
remote_pass=self.remote_pass, setup_cache=SETUP_CACHE,
|
||||||
callbacks=self.runner_callbacks,
|
callbacks=self.runner_callbacks,
|
||||||
).run()
|
).run()
|
||||||
|
|
|
@ -60,8 +60,8 @@ class Runner(object):
|
||||||
module_name=C.DEFAULT_MODULE_NAME, module_args=C.DEFAULT_MODULE_ARGS,
|
module_name=C.DEFAULT_MODULE_NAME, module_args=C.DEFAULT_MODULE_ARGS,
|
||||||
forks=C.DEFAULT_FORKS, timeout=C.DEFAULT_TIMEOUT, pattern=C.DEFAULT_PATTERN,
|
forks=C.DEFAULT_FORKS, timeout=C.DEFAULT_TIMEOUT, pattern=C.DEFAULT_PATTERN,
|
||||||
remote_user=C.DEFAULT_REMOTE_USER, remote_pass=C.DEFAULT_REMOTE_PASS,
|
remote_user=C.DEFAULT_REMOTE_USER, remote_pass=C.DEFAULT_REMOTE_PASS,
|
||||||
background=0, basedir=None, setup_cache=None, transport='paramiko',
|
remote_port=C.DEFAULT_REMOTE_PORT, background=0, basedir=None, setup_cache=None,
|
||||||
conditional='True', groups={}, callbacks=None, verbose=False):
|
transport='paramiko', conditional='True', groups={}, callbacks=None, verbose=False):
|
||||||
|
|
||||||
if setup_cache is None:
|
if setup_cache is None:
|
||||||
setup_cache = {}
|
setup_cache = {}
|
||||||
|
@ -92,6 +92,7 @@ class Runner(object):
|
||||||
self.verbose = verbose
|
self.verbose = verbose
|
||||||
self.remote_user = remote_user
|
self.remote_user = remote_user
|
||||||
self.remote_pass = remote_pass
|
self.remote_pass = remote_pass
|
||||||
|
self.remote_port = remote_port
|
||||||
self.background = background
|
self.background = background
|
||||||
self.basedir = basedir
|
self.basedir = basedir
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue