1.2.2 fix guest_update power, boot_disk_type defaults, README, window…

…s support

Former-commit-id: fe94efa7dbce651fc97bd24bbc209035cefb650a

README.md

@@ -193,6 +193,7 @@ Known issues with vmware_esxi
 
 Version History
 ---------------
+* 1.2.2 fix guest_update power, boot_disk_type defaults, README, windows support
 * 1.2.1 Fix ssh connection retries.
 * 1.2.0 Add support for notes (annotation)
 * 1.1.1 Fix, unable to provision ova sources.  go fmt.

esxi/guest-create.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"os"
 	"os/exec"
+	"runtime"
 	"strconv"
 	"strings"
 )
@@ -19,6 +20,7 @@ func guestCREATE(c *Config, guest_name string, disk_store string,
 
 	var memsize, numvcpus, virthwver int
 	var boot_disk_vmdkPATH, remote_cmd, vmid, stdout, vmx_contents string
+	var osShellCmd, osShellCmdOpt string
 	var out bytes.Buffer
 	var err error
 	err = nil
@@ -196,7 +198,17 @@ func guestCREATE(c *Config, guest_name string, disk_store string,
 
 		ovf_cmd := fmt.Sprintf("ovftool --acceptAllEulas --noSSLVerify --X:useMacNaming=false "+
 			"-dm=%s --name='%s' --overwrite -ds='%s' %s '%s' '%s'", boot_disk_type, guest_name, disk_store, net_param, src_path, dst_path)
-		cmd := exec.Command("/bin/bash", "-c", ovf_cmd)
+
+		if runtime.GOOS == "windows" {
+			osShellCmd = "C:\\Windows\\System32\\cmd.exe"
+			osShellCmdOpt = "/c"
+			ovf_cmd = strings.Replace(ovf_cmd, "'", "", -1)
+		} else {
+			osShellCmd = "/bin/bash"
+			osShellCmdOpt = "-c"
+		}
+
+		cmd := exec.Command(osShellCmd, osShellCmdOpt, ovf_cmd)
 
 		log.Println("[guestCREATE] ovf_cmd: " + ovf_cmd)
 

esxi/guest_update.go

@@ -26,6 +26,7 @@ func resourceGUESTUpdate(d *schema.ResourceData, m interface{}) error {
 	guest_shutdown_timeout := d.Get("guest_shutdown_timeout").(int)
 	notes := d.Get("notes").(string)
 	lanAdaptersCount := d.Get("network_interfaces.#").(int)
+	power := d.Get("power").(string)
 
 	if lanAdaptersCount > 3 {
 		lanAdaptersCount = 3
@@ -96,10 +97,12 @@ func resourceGUESTUpdate(d *schema.ResourceData, m interface{}) error {
 	}
 
 	//  power on
-	_, err = guestPowerOn(c, vmid)
-	if err != nil {
-		fmt.Println("Failed to power on.")
-		return errors.New("Failed to power on.")
+	if power == "on" {
+		_, err = guestPowerOn(c, vmid)
+		if err != nil {
+			fmt.Println("Failed to power on.")
+			return errors.New("Failed to power on.")
+		}
 	}
 
 	return err

version

@@ -1 +1 @@
-v1.2.1
+v1.2.2