iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable to select NVMe images for googlecompute builder

This commit is contained in:
Yuki Takeichi 2016-03-11 17:51:12 +09:00 committed by Rickard von Essen
parent b98f8052e9
commit 04078c5c48
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builder/googlecompute/driver_gce.go
View File

@ -160,7 +160,7 @@ func (d *driverGCE) DeleteDisk(zone, name string) (<-chan error, error) {
} }
func (d *driverGCE) GetImage(name string) (*Image, error) { func (d *driverGCE) GetImage(name string) (*Image, error) {
projects := []string{d.projectId, "centos-cloud", "coreos-cloud", "debian-cloud", "google-containers", "opensuse-cloud", "rhel-cloud", "suse-cloud", "ubuntu-os-cloud", "windows-cloud"} projects := []string{d.projectId, "centos-cloud", "coreos-cloud", "debian-cloud", "google-containers", "opensuse-cloud", "rhel-cloud", "suse-cloud", "ubuntu-os-cloud", "windows-cloud", "gce-nvme"}
var errs error var errs error
for _, project := range projects { for _, project := range projects {
image, err := d.GetImageFromProject(project, name) image, err := d.GetImageFromProject(project, name)
@ -186,11 +186,11 @@ func (d *driverGCE) GetImageFromProject(project, name string) (*Image, error) {
return nil, fmt.Errorf("Image, %s, could not be found in project: %s", name, project) return nil, fmt.Errorf("Image, %s, could not be found in project: %s", name, project)
} else { } else {
return &Image{ return &Image{
Licenses: image.Licenses, Licenses: image.Licenses,
Name: image.Name, Name: image.Name,
ProjectId: project, ProjectId: project,
SelfLink: image.SelfLink, SelfLink: image.SelfLink,
SizeGb: image.DiskSizeGb, SizeGb: image.DiskSizeGb,
}, nil }, nil
} }
} }
@ -251,7 +251,7 @@ func (d *driverGCE) GetSerialPortOutput(zone, name string) (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
return output.Contents, nil return output.Contents, nil
} }