internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 21:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

add support for using an alternate remote port

Browse Source
This commit is contained in:
Christopher Johnston
2012-03-28 14:05:31 -07:00
parent 9777653741
commit f06ec76fdb
5 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ansible/connection.py
View File

@@ -65,7 +65,8 @@ class ParamikoConnection(object):
allow_agent=True,
look_for_keys=True,
password=self.runner.remote_pass,
timeout=self.runner.timeout
timeout=self.runner.timeout,
port=self.runner.remote_port
)
except Exception, e:
raise errors.AnsibleConnectionFailed(str(e))

3
lib/ansible/constants.py
View File

@@ -32,5 +32,4 @@ DEFAULT_TIMEOUT = 10
DEFAULT_POLL_INTERVAL = 15
DEFAULT_REMOTE_USER = 'root'
DEFAULT_REMOTE_PASS = None
DEFAULT_REMOTE_PORT = 22

6
lib/ansible/playbook.py
View File

@@ -54,6 +54,7 @@ class PlayBook(object):
timeout = C.DEFAULT_TIMEOUT,
remote_user = C.DEFAULT_REMOTE_USER,
remote_pass = C.DEFAULT_REMOTE_PASS,
remote_port = C.DEFAULT_REMOTE_PORT,
override_hosts = None,
verbose = False,
callbacks = None,
@@ -69,6 +70,7 @@ class PlayBook(object):
self.timeout = timeout
self.remote_user = remote_user
self.remote_pass = remote_pass
self.remote_port = remote_port
self.verbose = verbose
self.callbacks = callbacks
self.runner_callbacks = runner_callbacks
@@ -262,7 +264,7 @@ class PlayBook(object):
pattern=pattern, groups=self.groups, module_name=module,
module_args=args, host_list=hosts, forks=self.forks,
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,
conditional=only_if, callbacks=self.runner_callbacks,
)
@@ -426,7 +428,7 @@ class PlayBook(object):
pattern=pattern, groups=self.groups, module_name='setup',
module_args=push_var_str, host_list=host_list,
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,
callbacks=self.runner_callbacks,
).run()

5
lib/ansible/runner.py
View File

@@ -60,8 +60,8 @@ class Runner(object):
module_name=C.DEFAULT_MODULE_NAME, module_args=C.DEFAULT_MODULE_ARGS,
forks=C.DEFAULT_FORKS, timeout=C.DEFAULT_TIMEOUT, pattern=C.DEFAULT_PATTERN,
remote_user=C.DEFAULT_REMOTE_USER, remote_pass=C.DEFAULT_REMOTE_PASS,
background=0, basedir=None, setup_cache=None, transport='paramiko',
conditional='True', groups={}, callbacks=None, verbose=False):
remote_port=C.DEFAULT_REMOTE_PORT, background=0, basedir=None, setup_cache=None,
transport='paramiko', conditional='True', groups={}, callbacks=None, verbose=False):
if setup_cache is None:
setup_cache = {}
@@ -92,6 +92,7 @@ class Runner(object):
self.verbose = verbose
self.remote_user = remote_user
self.remote_pass = remote_pass
self.remote_port = remote_port
self.background = background
self.basedir = basedir