From 01130da729da2bb8c6b04f4047d3719b8847996b Mon Sep 17 00:00:00 2001 From: Misha Brukman Date: Fri, 18 Jul 2014 15:08:08 -0400 Subject: [PATCH] builder/googlecompute: added support for all standard VM images Also fixed the error message to be clear that the image was not found in any of the projects that we attempted to search, rather than keep the error message from the last project, which may be confusing to users. --- builder/googlecompute/driver_gce.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/builder/googlecompute/driver_gce.go b/builder/googlecompute/driver_gce.go index 83552aa09..3924d38d1 100644 --- a/builder/googlecompute/driver_gce.go +++ b/builder/googlecompute/driver_gce.go @@ -229,7 +229,7 @@ func (d *driverGCE) WaitForInstance(state, zone, name string) <-chan error { } func (d *driverGCE) getImage(name string) (image *compute.Image, err error) { - projects := []string{d.projectId, "debian-cloud", "centos-cloud"} + projects := []string{d.projectId, "centos-cloud", "debian-cloud", "google-containers", "rhel-cloud", "suse-cloud"} for _, project := range projects { image, err = d.service.Images.Get(project, name).Do() if err == nil && image != nil && image.SelfLink != "" { @@ -238,10 +238,7 @@ func (d *driverGCE) getImage(name string) (image *compute.Image, err error) { image = nil } - if err == nil { - err = fmt.Errorf("Image could not be found: %s", name) - } - + err = fmt.Errorf("Image %s could not be found in any of these projects: %s", name, projects) return }