svn commit: r1135619 - /libcloud/trunk/libcloud/compute/base.py

[to...@apache.org]

Author: tomaz
Date: Tue Jun 14 14:49:21 2011
New Revision: 1135619

URL: http://svn.apache.org/viewvc?rev=1135619&view=rev
Log:
1. Update deploy_node docstring
2. Should be continue, not break
3. Don't hard code the timeout

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

Modified: libcloud/trunk/libcloud/compute/base.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/base.py?rev=1135619&r1=1135618&r2=1135619&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/base.py (original)
+++ libcloud/trunk/libcloud/compute/base.py Tue Jun 14 14:49:21 2011
@@ -475,6 +475,10 @@ class NodeDriver(object):
                                  (default is None)
         @type       ssh_timeout: C{float}
 
+        @keyword    auth:   Initial authentication information for the node
+                            (optional)
+        @type       auth:   L{NodeAuthSSHKey} or L{NodeAuthPassword}
+
         See L{NodeDriver.create_node} for more keyword args.
 
         >>> from libcloud.compute.drivers.dummy import DummyNodeDriver
@@ -498,6 +502,7 @@ class NodeDriver(object):
         # TODO: support ssh keys
         # FIX: this method is too long and complicated
         WAIT_PERIOD=3
+        TIMEOUT=60 * 15 # 15 minutes
         password = None
 
         if 'generates_password' not in self.features["create_node"]:
@@ -514,7 +519,8 @@ class NodeDriver(object):
             if 'generates_password' in self.features["create_node"]:
                 password = node.extra.get('password')
                 start = time.time()
-                end = start + (60 * 15)# FIX: this should be soft-coded
+                end = start + TIMEOUT
+
                 while time.time() < end:
                     # need to wait until we get a public IP address.
                     # TODO: there must be a better way of doing this
@@ -537,7 +543,7 @@ class NodeDriver(object):
                     if (node.public_ip is not None
                         and node.public_ip != ""
                         and node.state == NodeState.RUNNING):
-                        break
+                        continue
 
                     ssh_username = kwargs.get('ssh_username', 'root')
                     ssh_port = kwargs.get('ssh_port', 22)