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

Merge pull request #8975 from jhawk28/vsphereiso_disksize_fix 

disk_size should not be required if storage is defined
This commit is contained in:
Megan Marsh 2020-03-31 10:09:36 -07:00 committed by GitHub
parent 45da4c8ee7 cf3c448d17
commit fc911f0731
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builder/vsphere/iso/step_create.go
View File

@ -70,8 +70,14 @@ type CreateConfig struct {
func (c *CreateConfig) Prepare() []error { func (c *CreateConfig) Prepare() []error {
var errs []error var errs []error
if c.DiskSize == 0 { if len(c.Storage) > 0 {
errs = append(errs, fmt.Errorf("'disk_size' is required")) for i, storage := range c.Storage {
if storage.DiskSize == 0 {
errs = append(errs, fmt.Errorf("storage[%d].'disk_size' is required", i))
}
}
} else if c.DiskSize == 0 {
errs = append(errs, fmt.Errorf("'disk_size' or 'storage' is required"))
} }
if c.GuestOSType == "" { if c.GuestOSType == "" {