Skip to content

P
packer
Commit 289fdc62 authored by Eric Johnson's avatar Eric Johnson
Browse files
Options

Merge pull request #1676 from mbrukman/gce-ubuntu 

Added the Ubuntu image project for GCE.
parents ec216a52 74e1be74
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
builder/googlecompute/driver_gce.go
View file @ 289fdc62
...@@ -235,7 +235,7 @@ func (d *driverGCE) WaitForInstance(state, zone, name string) <-chan error { ...@@ -235,7 +235,7 @@ func (d *driverGCE) WaitForInstance(state, zone, name string) <-chan error {
} }
func (d *driverGCE) getImage(img Image) (image *compute.Image, err error) { func (d *driverGCE) getImage(img Image) (image *compute.Image, err error) {
projects := []string{img.ProjectId, "centos-cloud", "coreos-cloud", "debian-cloud", "google-containers", "opensuse-cloud", "rhel-cloud", "suse-cloud", "windows-cloud"} projects := []string{img.ProjectId, "centos-cloud", "coreos-cloud", "debian-cloud", "google-containers", "opensuse-cloud", "rhel-cloud", "suse-cloud", "ubuntu-os-cloud", "windows-cloud"}
for _, project := range projects { for _, project := range projects {
image, err = d.service.Images.Get(project, img.Name).Do() image, err = d.service.Images.Get(project, img.Name).Do()
if err == nil && image != nil && image.SelfLink != "" { if err == nil && image != nil && image.SelfLink != "" {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7