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

Merge pull request #3338 from yuki-takeichi/gce-nvme

This commit is contained in:
Rickard von Essen 2016-09-20 12:50:43 +02:00
parent 13c9db5dd5 04078c5c48
commit 9ce70bfce0
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) {
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
for _, project := range projects {
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)
} else {
return &Image{
Licenses: image.Licenses,
Name: image.Name,
Licenses: image.Licenses,
Name: image.Name,
ProjectId: project,
SelfLink: image.SelfLink,
SizeGb: image.DiskSizeGb,
SelfLink: image.SelfLink,
SizeGb: image.DiskSizeGb,
}, nil
}
}
@ -251,7 +251,7 @@ func (d *driverGCE) GetSerialPortOutput(zone, name string) (string, error) {
if err != nil {
return "", err
}
return output.Contents, nil
}