From cf3c448d17ea1b2b9a1717b6fc8805068ea2259d Mon Sep 17 00:00:00 2001
From: Joshua Foster <joshua.foster@lmco.com>
Date: Tue, 31 Mar 2020 11:47:09 -0400
Subject: [PATCH] disk_size should not be required if storage is defined

---
 builder/vsphere/iso/step_create.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/builder/vsphere/iso/step_create.go b/builder/vsphere/iso/step_create.go
index 67a59b35e..f3366a0b5 100644
--- a/builder/vsphere/iso/step_create.go
+++ b/builder/vsphere/iso/step_create.go
@@ -70,8 +70,14 @@ type CreateConfig struct {
 func (c *CreateConfig) Prepare() []error {
 	var errs []error
 
-	if c.DiskSize == 0 {
-		errs = append(errs, fmt.Errorf("'disk_size' is required"))
+	if len(c.Storage) > 0 {
+		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 == "" {