You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2014/07/07 20:46:50 UTC
[1/3] git commit: Modify deploy_node so it's future proof and will
also work correctly when authentication bug
(https://github.com/paramiko/paramiko/pull/351) has been fixed in paramiko.
Repository: libcloud
Updated Branches:
refs/heads/trunk 6df77f6e2 -> 3d2a38db9
Modify deploy_node so it's future proof and will also work correctly when
authentication bug (https://github.com/paramiko/paramiko/pull/351) has been
fixed in paramiko.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/b392c964
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/b392c964
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/b392c964
Branch: refs/heads/trunk
Commit: b392c964457e8c3948b615e0036f823ef420bc1a
Parents: 0314a1a
Author: Tomaz Muraus <to...@apache.org>
Authored: Sun Jul 6 21:48:01 2014 +0200
Committer: Tomaz Muraus <to...@apache.org>
Committed: Sun Jul 6 21:48:01 2014 +0200
----------------------------------------------------------------------
libcloud/compute/base.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/b392c964/libcloud/compute/base.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/base.py b/libcloud/compute/base.py
index f9a9e31..a585128 100644
--- a/libcloud/compute/base.py
+++ b/libcloud/compute/base.py
@@ -42,8 +42,10 @@ from libcloud.utils.networking import is_valid_ip_address
if have_paramiko:
from paramiko.ssh_exception import SSHException
- SSH_TIMEOUT_EXCEPTION_CLASSES = (SSHException, IOError, socket.gaierror,
- socket.error)
+ from paramiko.ssh_exception import AuthenticationException
+
+ SSH_TIMEOUT_EXCEPTION_CLASSES = (AuthenticationException, SSHException,
+ IOError, socket.gaierror, socket.error)
else:
SSH_TIMEOUT_EXCEPTION_CLASSES = (IOError, socket.gaierror, socket.error)
[3/3] git commit: Updating Compute Engine image project list
Posted by to...@apache.org.
Updating Compute Engine image project list
Signed-off-by: Tomaz Muraus <to...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/3d2a38db
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/3d2a38db
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/3d2a38db
Branch: refs/heads/trunk
Commit: 3d2a38db9e15e67e8ea8639782446960bf968ee4
Parents: 810bbe2
Author: Eric Johnson <er...@google.com>
Authored: Tue Jul 1 09:03:17 2014 -0700
Committer: Tomaz Muraus <to...@apache.org>
Committed: Mon Jul 7 20:37:31 2014 +0200
----------------------------------------------------------------------
libcloud/compute/drivers/gce.py | 9 ++++++++-
libcloud/test/compute/test_gce.py | 4 ++--
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/3d2a38db/libcloud/compute/drivers/gce.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/gce.py b/libcloud/compute/drivers/gce.py
index a1cf75e..c216c64 100644
--- a/libcloud/compute/drivers/gce.py
+++ b/libcloud/compute/drivers/gce.py
@@ -2305,10 +2305,17 @@ class GCENodeDriver(NodeDriver):
return self._to_node_image(response.object)
image = self._match_images(None, partial_name)
if not image:
- if partial_name.startswith('debian'):
+ if (partial_name.startswith('debian') or
+ partial_name.startswith('backports')):
image = self._match_images('debian-cloud', partial_name)
elif partial_name.startswith('centos'):
image = self._match_images('centos-cloud', partial_name)
+ elif partial_name.startswith('sles'):
+ image = self._match_images('suse-cloud', partial_name)
+ elif partial_name.startswith('rhel'):
+ image = self._match_images('rhel-cloud', partial_name)
+ elif partial_name.startswith('windows'):
+ image = self._match_images('windows-cloud', partial_name)
elif partial_name.startswith('container-vm'):
image = self._match_images('google-containers', partial_name)
http://git-wip-us.apache.org/repos/asf/libcloud/blob/3d2a38db/libcloud/test/compute/test_gce.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_gce.py b/libcloud/test/compute/test_gce.py
index 80110d0..faf6303 100644
--- a/libcloud/test/compute/test_gce.py
+++ b/libcloud/test/compute/test_gce.py
@@ -100,8 +100,8 @@ class GCENodeDriverTest(LibcloudTestCase, TestCaseMixin):
project = 'debian-cloud'
image = self.driver._match_images(project, 'debian-7')
self.assertEqual(image.name, 'debian-7-wheezy-v20131120')
- image = self.driver._match_images(project, 'debian-6')
- self.assertEqual(image.name, 'debian-6-squeeze-v20130926')
+ image = self.driver._match_images(project, 'backports')
+ self.assertEqual(image.name, 'backports-debian-7-wheezy-v20131127')
def test_ex_list_addresses(self):
address_list = self.driver.ex_list_addresses()
[2/3] git commit: Merge branch 'trunk' of
https://git-wip-us.apache.org/repos/asf/libcloud into trunk
Posted by to...@apache.org.
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/libcloud into trunk
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/810bbe2b
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/810bbe2b
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/810bbe2b
Branch: refs/heads/trunk
Commit: 810bbe2b94236e2446a9a2501f282c93523d2e5e
Parents: b392c96 6df77f6
Author: Tomaz Muraus <to...@apache.org>
Authored: Mon Jul 7 20:36:23 2014 +0200
Committer: Tomaz Muraus <to...@apache.org>
Committed: Mon Jul 7 20:36:23 2014 +0200
----------------------------------------------------------------------
CHANGES.rst | 4 ++--
libcloud/__init__.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------