cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #63 from chjohnst/master

Browse source 
add -T option for ssh timeout
This commit is contained in:
Michael DeHaan 2012-03-01 17:06:40 -08:00
commit 24d854e0bc
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bin/ansible
View file

@ -59,6 +59,8 @@ class Cli(object):
help="try to print output on one line") help="try to print output on one line")
parser.add_option('-t', '--tree', dest='tree', default=None, parser.add_option('-t', '--tree', dest='tree', default=None,
help="if specified, a directory name to save output to, one file per host") help="if specified, a directory name to save output to, one file per host")
parser.add_option('-T', '--timeout', default=C.DEFAULT_TIMEOUT, type='int',
dest='timeout', help="set the timeout in seconds for ssh")
options, args = parser.parse_args() options, args = parser.parse_args()
@ -82,6 +84,7 @@ class Cli(object):
remote_user=options.remote_user, remote_user=options.remote_user,
remote_pass=sshpass, remote_pass=sshpass,
host_list=options.host_list, host_list=options.host_list,
timeout=options.timeout,
forks=options.forks, forks=options.forks,
pattern=options.pattern, pattern=options.pattern,
verbose=True, verbose=True,

2
lib/ansible/runner.py
View file

@ -117,7 +117,7 @@ class Runner(object):
try: try:
# try paramiko # try paramiko
ssh.connect(host, username=self.remote_user, allow_agent=True, ssh.connect(host, username=self.remote_user, allow_agent=True,
look_for_keys=True, password=self.remote_pass) look_for_keys=True, password=self.remote_pass timeout=self.timeout)
return [ True, ssh ] return [ True, ssh ]
except Exception, e: except Exception, e:
# it failed somehow, return the failure string # it failed somehow, return the failure string