From d3029090a9d14341b3a004be98a29d8e6a4e53e8 Mon Sep 17 00:00:00 2001 From: Christophe Jauffret Date: Thu, 17 Aug 2023 11:27:56 +0200 Subject: [PATCH] fix check on cluster_uuid --- builder/nutanix/config.go | 6 +++--- builder/nutanix/driver.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builder/nutanix/config.go b/builder/nutanix/config.go index ee0eedd..561f2d5 100644 --- a/builder/nutanix/config.go +++ b/builder/nutanix/config.go @@ -138,9 +138,9 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) { } // Validate Cluster Name - if c.VmConfig.ClusterName == "" { - log.Println("Nutanix Cluster Name missing from configuration") - errs = packersdk.MultiErrorAppend(errs, fmt.Errorf("missing cluster_name")) + if c.VmConfig.ClusterName == "" && c.VmConfig.ClusterUUID == "" { + log.Println("Nutanix Cluster Name or UUID missing from configuration") + errs = packersdk.MultiErrorAppend(errs, fmt.Errorf("missing cluster_name or cluster_uuid")) } // Validate VM disks diff --git a/builder/nutanix/driver.go b/builder/nutanix/driver.go index 3b8902f..72f69af 100644 --- a/builder/nutanix/driver.go +++ b/builder/nutanix/driver.go @@ -449,7 +449,7 @@ func (d *NutanixDriver) CreateRequest(vm VmConfig, state multistep.StateBag) (*v if err != nil { return nil, fmt.Errorf("error while GetCluster, %s", err.Error()) } - } else if vm.ClusterName != "" { + } else { cluster, err = findClusterByName(conn, vm.ClusterName) if err != nil { return nil, fmt.Errorf("error while findClusterByName, %s", err.Error())