libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject svn commit: r1102981 - /incubator/libcloud/trunk/libcloud/compute/base.py
Date Sat, 14 May 2011 09:16:24 GMT
Author: tomaz
Date: Sat May 14 09:16:24 2011
New Revision: 1102981

URL: http://svn.apache.org/viewvc?rev=1102981&view=rev
Log:
If a ssh timeout is not provided default to 20 seconds.

Modified:
    incubator/libcloud/trunk/libcloud/compute/base.py

Modified: incubator/libcloud/trunk/libcloud/compute/base.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/compute/base.py?rev=1102981&r1=1102980&r2=1102981&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/compute/base.py (original)
+++ incubator/libcloud/trunk/libcloud/compute/base.py Sat May 14 09:16:24 2011
@@ -541,11 +541,12 @@ class NodeDriver(object):
 
                     ssh_username = kwargs.get('ssh_username', 'root')
                     ssh_port = kwargs.get('ssh_port', 22)
+                    ssh_timeout = kwargs.get('ssh_timeout', 20)
 
                     client = SSHClient(hostname=node.public_ip[0],
                                        port=ssh_port, username=ssh_username,
                                        password=password,
-                                       timeout=kwargs.get('ssh_timeout', None))
+                                       timeout=ssh_timeout)
 
                     while time.time() < end:
                         try:



Mime
View raw message