CLOUD-724: copy_out_guest_install_log + Big Sur support/default resou…

…rce changes for create

.gitignore

@@ -43,3 +43,4 @@ _testmain.go
 *.prof
 
 .DS_Store
+install-anka-packer*.log

builder/anka/config.go

@@ -15,7 +15,7 @@ import (
 	"github.com/mitchellh/mapstructure"
 )
 
-const DEFAULT_BOOT_DELAY = "10s"
+const DEFAULT_BOOT_DELAY = "20s"
 
 type Config struct {
 	common.PackerConfig `mapstructure:",squash"`
@@ -39,6 +39,7 @@ type Config struct {
 	BootDelay  string `mapstructure:"boot_delay"`
 	EnableHtt  bool   `mapstructure:"enable_htt"`
 	DisableHtt bool   `mapstructure:"disable_htt"`
+	CopyOutGuestInstallLog     bool `mapstructure:"copy_out_guest_install_log"`
 
 	ctx interpolate.Context
 }

builder/anka/step_create_vm.go

@@ -26,11 +26,12 @@ func init() {
 type StepCreateVM struct {
 	client *client.Client
 	vmName string
+	config *Config
 }
 
 const (
-	DEFAULT_DISK_SIZE = "25G"
-	DEFAULT_RAM_SIZE  = "2G"
+	DEFAULT_DISK_SIZE = "35G"
+	DEFAULT_RAM_SIZE  = "4G"
 	DEFAULT_CPU_COUNT = "2"
 )
 
@@ -154,11 +155,14 @@ func (s *StepCreateVM) modifyVMProperties(describeResponse client.DescribeRespon
 
 func (s *StepCreateVM) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	config := state.Get("config").(*Config)
+
 	ui := state.Get("ui").(packer.Ui)
 
 	s.client = state.Get("client").(*client.Client)
 	sourceVMName := config.SourceVMName
 
+	s.config = config
+
 	onError := func(err error) multistep.StepAction {
 		return stepError(ui, state, err)
 	}
@@ -296,20 +300,6 @@ func (s *StepCreateVM) Cleanup(state multistep.StateBag) {
 		return
 	}
 
-	dir, dir_err := os.Getwd()
-	if dir_err == nil {
-		err = s.client.Copy(client.CopyParams{
-			Src: s.vmName + ":/var/log/install.log",
-			Dst: dir + "/install-" + s.vmName + ".log",
-		})
-
-		if err != nil {
-			log.Println("Error downloading install log from VM")
-		}
-
-		ui.Say(fmt.Sprintf("Saved install.log from %s to ./install-%s.log", s.vmName, s.vmName))
-	}
-
 	_, halted := state.GetOk(multistep.StateHalted)
 	_, canceled := state.GetOk(multistep.StateCancelled)
 	errorObj := state.Get("error")
@@ -319,6 +309,19 @@ func (s *StepCreateVM) Cleanup(state multistep.StateBag) {
 	case *common.VMNotFoundException:
 		return
 	default:
+		if s.config.CopyOutGuestInstallLog {
+			dir, dir_err := os.Getwd()
+			if dir_err == nil {
+				err = s.client.Copy(client.CopyParams{
+					Src: s.vmName + ":/var/log/install.log",
+					Dst: dir + "/install-" + s.vmName + ".log",
+				})
+				if err != nil {
+					log.Println("Error downloading install log from VM")
+				}
+				ui.Say(fmt.Sprintf("Saved install.log from %s to ./install-%s.log", s.vmName, s.vmName))
+			}
+		}
 		if halted || canceled {
 			ui.Say(fmt.Sprintf("Deleting VM %s", s.vmName))
 			err = s.client.Delete(client.DeleteParams{VMName: s.vmName})

examples/macos-sierra.json → examples/clone-existing-copy_out_guest_install_log.json

@@ -14,8 +14,7 @@
   ],
   "builders": [{
     "type": "veertu-anka",
-    "installer_app": "/Applications/Install macOS Sierra.app/",
-    "disk_size": "25G",
+    "copy_out_guest_install_log": true,
     "source_vm_name": "{{user `source_vm_name`}}"
   }]
-}
+}

examples/macos-catalina-existing-with-name.json → examples/clone-existing-from-installer-with-vm_name.json

@@ -14,7 +14,7 @@
   ],
 "builders": [{
   "type": "veertu-anka",
-  "installer_app": "/Applications/Install macOS Catalina.app",
+  "installer_app": "/Applications/Install macOS Big Sur.app",
   "vm_name": "Testing"
 }]
 }

examples/macos-catalina-existing.json → examples/clone-existing.json

@@ -12,11 +12,11 @@
       ]
     }
   ],
-"builders": [{
-  "type": "veertu-anka",
-  "cpu_count": 8,
-  "ram_size": "10G",
-  "disk_size": "150G",
-  "source_vm_name": "{{user `source_vm_name`}}"
-}]
+  "builders": [{
+    "type": "veertu-anka",
+    "cpu_count": 8,
+    "ram_size": "10G",
+    "disk_size": "150G",
+    "source_vm_name": "{{user `source_vm_name`}}"
+  }]
 }