Merge pull request #2271 from legal90/prl-default-settings

Parallels: Apply default settings on the VM creation step.

builder/parallels/common/driver.go

@@ -44,6 +44,9 @@ type Driver interface {
 	// Send scancodes to the vm using the prltype python script.
 	SendKeyScanCodes(string, ...string) error
 
+	// Apply default сonfiguration settings to the virtual machine
+	SetDefaultConfiguration(string) error
+
 	// Finds the MAC address of the NIC nic0
 	Mac(string) (string, error)
 

builder/parallels/common/driver_10.go

@@ -5,3 +5,27 @@ package common
 type Parallels10Driver struct {
 	Parallels9Driver
 }
+
+func (d *Parallels10Driver) SetDefaultConfiguration(vmName string) error {
+	commands := make([][]string, 12)
+	commands[0] = []string{"set", vmName, "--cpus", "1"}
+	commands[1] = []string{"set", vmName, "--memsize", "512"}
+	commands[2] = []string{"set", vmName, "--startup-view", "same"}
+	commands[3] = []string{"set", vmName, "--on-shutdown", "close"}
+	commands[4] = []string{"set", vmName, "--on-window-close", "keep-running"}
+	commands[5] = []string{"set", vmName, "--auto-share-camera", "off"}
+	commands[6] = []string{"set", vmName, "--smart-guard", "off"}
+	commands[7] = []string{"set", vmName, "--shared-cloud", "off"}
+	commands[8] = []string{"set", vmName, "--shared-profile", "off"}
+	commands[9] = []string{"set", vmName, "--smart-mount", "off"}
+	commands[10] = []string{"set", vmName, "--sh-app-guest-to-host", "off"}
+	commands[11] = []string{"set", vmName, "--sh-app-host-to-guest", "off"}
+
+	for _, command := range commands {
+		err := d.Prlctl(command...)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}

builder/parallels/common/driver_9.go

@@ -255,6 +255,25 @@ func prepend(head string, tail []string) []string {
 	return tmp
 }
 
+func (d *Parallels9Driver) SetDefaultConfiguration(vmName string) error {
+	commands := make([][]string, 7)
+	commands[0] = []string{"set", vmName, "--cpus", "1"}
+	commands[1] = []string{"set", vmName, "--memsize", "512"}
+	commands[2] = []string{"set", vmName, "--startup-view", "same"}
+	commands[3] = []string{"set", vmName, "--on-shutdown", "close"}
+	commands[4] = []string{"set", vmName, "--on-window-close", "keep-running"}
+	commands[5] = []string{"set", vmName, "--auto-share-camera", "off"}
+	commands[6] = []string{"set", vmName, "--smart-guard", "off"}
+
+	for _, command := range commands {
+		err := d.Prlctl(command...)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 func (d *Parallels9Driver) Mac(vmName string) (string, error) {
 	var stdout bytes.Buffer
 

builder/parallels/iso/step_create_vm.go

@@ -23,37 +23,33 @@ func (s *stepCreateVM) Run(state multistep.StateBag) multistep.StepAction {
 	ui := state.Get("ui").(packer.Ui)
 	name := config.VMName
 
-	commands := make([][]string, 8)
-	commands[0] = []string{
+	command := []string{
 		"create", name,
 		"--distribution", config.GuestOSType,
 		"--dst", config.OutputDir,
 		"--vmtype", "vm",
 		"--no-hdd",
 	}
-	commands[1] = []string{"set", name, "--cpus", "1"}
-	commands[2] = []string{"set", name, "--memsize", "512"}
-	commands[3] = []string{"set", name, "--startup-view", "same"}
-	commands[4] = []string{"set", name, "--on-shutdown", "close"}
-	commands[5] = []string{"set", name, "--on-window-close", "keep-running"}
-	commands[6] = []string{"set", name, "--auto-share-camera", "off"}
-	commands[7] = []string{"set", name, "--smart-guard", "off"}
 
 	ui.Say("Creating virtual machine...")
-	for _, command := range commands {
-		err := driver.Prlctl(command...)
-		ui.Say(fmt.Sprintf("Executing: prlctl %s", command))
-		if err != nil {
-			err := fmt.Errorf("Error creating VM: %s", err)
-			state.Put("error", err)
-			ui.Error(err.Error())
-			return multistep.ActionHalt
-		}
+	if err := driver.Prlctl(command...); err != nil {
+		err := fmt.Errorf("Error creating VM: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
 
-		// Set the VM name property on the first command
-		if s.vmName == "" {
-			s.vmName = name
-		}
+	ui.Say("Applying default settings...")
+	if err := driver.SetDefaultConfiguration(name); err != nil {
+		err := fmt.Errorf("Error VM configuration: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	// Set the VM name property on the first command
+	if s.vmName == "" {
+		s.vmName = name
 	}
 
 	// Set the final name in the state bag so others can use it