libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject svn commit: r1336478 - /libcloud/trunk/libcloud/compute/base.py
Date Thu, 10 May 2012 04:11:41 GMT
Author: tomaz
Date: Thu May 10 04:11:41 2012
New Revision: 1336478

URL: http://svn.apache.org/viewvc?rev=1336478&view=rev
Log:
This should be located inside try / catch block.

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=1336478&r1=1336477&r2=1336478&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/base.py (original)
+++ libcloud/trunk/libcloud/compute/base.py Thu May 10 04:11:41 2012
@@ -582,6 +582,9 @@ class NodeDriver(BaseDriver):
             node = self._wait_until_running(node=node, wait_period=3,
                                             timeout=NODE_ONLINE_WAIT_TIMEOUT)
 
+            if password:
+                node.extra['password'] = password
+
             ssh_username = kwargs.get('ssh_username', 'root')
             ssh_port = kwargs.get('ssh_port', 22)
             ssh_timeout = kwargs.get('ssh_timeout', 10)
@@ -606,9 +609,6 @@ class NodeDriver(BaseDriver):
             e = sys.exc_info()[1]
             raise DeploymentError(node, e)
 
-        if password:
-            node.extra['password'] = password
-
         return node
 
     def _wait_until_running(self, node, wait_period=3, timeout=600):



Mime
View raw message