Updated Branches: refs/heads/trunk 14e375e4c -> fe998bf6a
modified timeout in deploy node method. This was modified such that the the timeout is respected when passed as a kwargs. Signed-off-by: Tomaz Muraus <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/8410ec19 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/8410ec19 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/8410ec19 Branch: refs/heads/trunk Commit: 8410ec19fb6a2a6a49d31e13911afa013d3ea4cd Parents: 14e375e Author: cloudnull <[email protected]> Authored: Thu Jun 13 16:47:59 2013 -0500 Committer: Tomaz Muraus <[email protected]> Committed: Fri Jun 14 21:27:00 2013 -0700 ---------------------------------------------------------------------- libcloud/compute/base.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/8410ec19/libcloud/compute/base.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/base.py b/libcloud/compute/base.py index c271479..829ec37 100644 --- a/libcloud/compute/base.py +++ b/libcloud/compute/base.py @@ -658,7 +658,8 @@ class NodeDriver(BaseDriver): try: node, ip_addresses = self.wait_until_running( nodes=[node], - wait_period=3, timeout=NODE_ONLINE_WAIT_TIMEOUT, + wait_period=3, + timeout=kwargs.get('timeout', NODE_ONLINE_WAIT_TIMEOUT), ssh_interface=ssh_interface)[0] except Exception: e = sys.exc_info()[1]
