Merge pull request #50 from luthermonson/cloud-config-logic

dropping iso gating logic
rancher · Nov 14, 2019 · c056b89 · c056b89
2 parents b59f376 + 9fee6de
commit c056b89
Showing 1 changed file with 11 additions and 18 deletions.
diff --git a/drivers/vmwarevsphere/cloudinit.go b/drivers/vmwarevsphere/cloudinit.go
@@ -26,28 +26,21 @@ func (d *Driver) cloudInit(vm *object.VirtualMachine) error {
 		return d.cloudInitGuestInfo(vm)
 	}
 
-	if d.CloudConfig == "" {
-		if err := d.createCloudInitIso(); err != nil {
-			return err
-		}
-
-		ds, err := d.getVmDatastore(vm)
-		if err != nil {
-			return err
-		}
+	if err := d.createCloudInitIso(); err != nil {
+		return err
+	}
 
-		err = d.uploadCloudInitIso(vm, d.datacenter, ds)
-		if err != nil {
-			return err
-		}
+	ds, err := d.getVmDatastore(vm)
+	if err != nil {
+		return err
+	}
 
-		err = d.mountCloudInitIso(vm, d.datacenter, ds)
-		if err != nil {
-			return err
-		}
+	err = d.uploadCloudInitIso(vm, d.datacenter, ds)
+	if err != nil {
+		return err
 	}
 
-	return nil
+	return d.mountCloudInitIso(vm, d.datacenter, ds)
 }
 
 func (d *Driver) cloudInitGuestInfo(vm *object.VirtualMachine) error {