Allows for the mounting of ISOs when a Proxmox VM s created. Same as …

builder/proxmox/config.go

@@ -92,7 +92,7 @@ type vgaConfig struct {
 }
 type storageConfig struct {
 	common.ISOConfig `mapstructure:",squash"`
-	DeviceType       string `mapstructure:"device_type"`
+	Device           string `mapstructure:"device"`
 	ISOFile          string `mapstructure:"iso_file"`
 	ISOStoragePool   string `mapstructure:"iso_storage_pool"`
 	Unmount          bool   `mapstructure:"unmount"`
@@ -209,14 +209,14 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 			warnings = append(warnings, isoWarnings...)
 			c.AdditionalISOFiles[idx].shouldUploadISO = true
 		}
-		if c.AdditionalISOFiles[idx].DeviceType == "" {
-			log.Printf("AdditionalISOFile %d DeviceType not set, using default 'ide3'", idx)
-			c.AdditionalISOFiles[idx].DeviceType = "ide3"
+		if c.AdditionalISOFiles[idx].Device == "" {
+			log.Printf("AdditionalISOFile %d Devicenot set, using default 'ide3'", idx)
+			c.AdditionalISOFiles[idx].Device = "ide3"
 		}
-		if strings.HasPrefix(c.AdditionalISOFiles[idx].DeviceType, "ide") {
-			busnumber, err := strconv.Atoi(c.AdditionalISOFiles[idx].DeviceType[3:])
+		if strings.HasPrefix(c.AdditionalISOFiles[idx].Device, "ide") {
+			busnumber, err := strconv.Atoi(c.AdditionalISOFiles[idx].Device[3:])
 			if err != nil {
-				errs = packer.MultiErrorAppend(errs, fmt.Errorf("%s is not a valid bus index", c.AdditionalISOFiles[idx].DeviceType[3:]))
+				errs = packer.MultiErrorAppend(errs, fmt.Errorf("%s is not a valid bus index", c.AdditionalISOFiles[idx].Device[3:]))
 			}
 			if busnumber == 2 {
 				errs = packer.MultiErrorAppend(errs, fmt.Errorf("IDE bus 2 is used by boot ISO"))
@@ -225,26 +225,26 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 				errs = packer.MultiErrorAppend(errs, fmt.Errorf("IDE bus index can't be higher than 3"))
 			}
 		}
-		if strings.HasPrefix(c.AdditionalISOFiles[idx].DeviceType, "sata") {
-			busnumber, err := strconv.Atoi(c.AdditionalISOFiles[idx].DeviceType[4:])
+		if strings.HasPrefix(c.AdditionalISOFiles[idx].Device, "sata") {
+			busnumber, err := strconv.Atoi(c.AdditionalISOFiles[idx].Device[4:])
 			if err != nil {
-				errs = packer.MultiErrorAppend(errs, fmt.Errorf("%s is not a valid bus index", c.AdditionalISOFiles[idx].DeviceType[4:]))
+				errs = packer.MultiErrorAppend(errs, fmt.Errorf("%s is not a valid bus index", c.AdditionalISOFiles[idx].Device[4:]))
 			}
 			if busnumber > 5 {
 				errs = packer.MultiErrorAppend(errs, fmt.Errorf("SATA bus index can't be higher than 5"))
 			}
 		}
-		if strings.HasPrefix(c.AdditionalISOFiles[idx].DeviceType, "scsi") {
-			busnumber, err := strconv.Atoi(c.AdditionalISOFiles[idx].DeviceType[4:])
+		if strings.HasPrefix(c.AdditionalISOFiles[idx].Device, "scsi") {
+			busnumber, err := strconv.Atoi(c.AdditionalISOFiles[idx].Device[4:])
 			if err != nil {
-				errs = packer.MultiErrorAppend(errs, fmt.Errorf("%s is not a valid bus index", c.AdditionalISOFiles[idx].DeviceType[4:]))
+				errs = packer.MultiErrorAppend(errs, fmt.Errorf("%s is not a valid bus index", c.AdditionalISOFiles[idx].Device[4:]))
 			}
 			if busnumber > 30 {
 				errs = packer.MultiErrorAppend(errs, fmt.Errorf("SCSI bus index can't be higher than 30"))
 			}
 		}
 		if (c.AdditionalISOFiles[idx].ISOFile == "" && len(c.AdditionalISOFiles[idx].ISOConfig.ISOUrls) == 0) || (c.AdditionalISOFiles[idx].ISOFile != "" && len(c.AdditionalISOFiles[idx].ISOConfig.ISOUrls) != 0) {
-			errs = packer.MultiErrorAppend(errs, fmt.Errorf("either iso_file or iso_url, but not both, must be specified for AdditionalISO file %s", c.AdditionalISOFiles[idx].DeviceType))
+			errs = packer.MultiErrorAppend(errs, fmt.Errorf("either iso_file or iso_url, but not both, must be specified for AdditionalISO file %s", c.AdditionalISOFiles[idx].Device))
 		}
 		if len(c.ISOConfig.ISOUrls) != 0 && c.ISOStoragePool == "" {
 			errs = packer.MultiErrorAppend(errs, errors.New("when specifying iso_url, iso_storage_pool must also be specified"))

builder/proxmox/step_finalize_template_config.go

@@ -102,7 +102,7 @@ func (s *stepFinalizeTemplateConfig) Run(ctx context.Context, state multistep.St
 			return multistep.ActionHalt
 		}
 		for idx := range c.AdditionalISOFiles {
-			cdrom := c.AdditionalISOFiles[idx].DeviceType
+			cdrom := c.AdditionalISOFiles[idx].Device
 			if c.AdditionalISOFiles[idx].Unmount {
 				if vmParams[cdrom] == nil || !strings.Contains(vmParams[cdrom].(string), "media=cdrom") {
 					err := fmt.Errorf("Cannot eject ISO from cdrom drive, %s is not present or not a cdrom media", cdrom)

builder/proxmox/step_start_vm.go

@@ -93,7 +93,7 @@ func (s *stepStartVM) Run(ctx context.Context, state multistep.StateBag) multist
 
 	for idx := range c.AdditionalISOFiles {
 		params := map[string]interface{}{
-			c.AdditionalISOFiles[idx].DeviceType: c.AdditionalISOFiles[idx].ISOFile + ",media=cdrom",
+			c.AdditionalISOFiles[idx].Device: c.AdditionalISOFiles[idx].ISOFile + ",media=cdrom",
 		}
 		_, err = client.SetVmConfig(vmRef, params)
 		if err != nil {

builder/proxmox/step_upload_additional_isos.go

@@ -30,7 +30,7 @@ func (s *stepUploadAdditionalISOs) Run(ctx context.Context, state multistep.Stat
 	for idx := range c.AdditionalISOFiles {
 		if !c.AdditionalISOFiles[idx].shouldUploadISO {
 			state.Put("additional_iso_files", c.AdditionalISOFiles)
-			return multistep.ActionContinue
+			continue
 		}
 
 		p := state.Get(c.AdditionalISOFiles[idx].downloadPathKey).(string)

website/pages/docs/builders/proxmox.mdx

@@ -1,4 +1,4 @@
----
+
 description: |
   The proxmox Packer builder is able to create new images for use with
   Proxmox VE. The builder takes an ISO source, runs any provisioning
@@ -219,14 +219,14 @@ builder.
   ```json
   [
     {
-      "device_type": "scsi5",
+      "device": "scsi5",
       "iso_file": "local:iso/virtio-win-0.1.185.iso",
       "unmount": true,
       "iso_checksum": "af2b3cc9fa7905dea5e58d31508d75bba717c2b0d5553962658a47aebc9cc386"
     }
   ]
   ```
-  - `device_type` (string) - Bus type and bus index that the ISO will be mounted on. Can be `ideX`,
+  - `device` (string) - Bus type and bus index that the ISO will be mounted on. Can be `ideX`,
     `sataX` or `scsiX`.
     For `ide` the bus index ranges from 0 to 3, for `sata` form 0 to 5 and for
     `scsi` from 0 to 30.