Repository: libcloud Updated Branches: refs/heads/trunk 074e86ccf -> e6c63bbf2
Support for Google-Containers Recently Google have released a google VM Image that comes with docker preinstalled and supports docker provisioning via metadata. Toady in libcloud both debian and centos images are supported by matching against the VM name and then injecting the appropiate project name (`debian-cloud` and `centos-cloud`). This adds support for `google-containers`. Closes #299 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/e6c63bbf Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/e6c63bbf Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/e6c63bbf Branch: refs/heads/trunk Commit: e6c63bbf217dc4950dced6b033a8ecb32dd34bed Parents: 074e86c Author: Magnus Andersson <[email protected]> Authored: Sun May 25 20:32:08 2014 +0200 Committer: Tomaz Muraus <[email protected]> Committed: Sun May 25 20:50:01 2014 +0200 ---------------------------------------------------------------------- CHANGES.rst | 5 +++++ libcloud/compute/drivers/gce.py | 2 ++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/e6c63bbf/CHANGES.rst ---------------------------------------------------------------------- diff --git a/CHANGES.rst b/CHANGES.rst index ff51f61..47ff16a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -150,6 +150,11 @@ Compute (GITHUB-294) [zerthimon] +- Allow user to retrieve container images using ex_get_image method in the + Google Compute Engine driver. + (GITHUB-299, LIBCLOUD-562) + [Magnus Andersson] + Storage ~~~~~~~ http://git-wip-us.apache.org/repos/asf/libcloud/blob/e6c63bbf/libcloud/compute/drivers/gce.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/gce.py b/libcloud/compute/drivers/gce.py index fe4dee4..b2b7663 100644 --- a/libcloud/compute/drivers/gce.py +++ b/libcloud/compute/drivers/gce.py @@ -2305,6 +2305,8 @@ class GCENodeDriver(NodeDriver): 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('container-vm'): + image = self._match_images('google-containers', partial_name) return image
