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

builder/proxmox/builder.go

@@ -71,8 +71,21 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			ResultKey:   downloadPathKey,
 			TargetPath:  b.config.TargetPath,
 			Url:         b.config.ISOUrls,
-		},
+		}}
+
+	for idx := range b.config.AdditionalISOFiles {
+		steps = append(steps, &common.StepDownload{
+			Checksum:    b.config.AdditionalISOFiles[idx].ISOChecksum,
+			Description: "additional ISO",
+			Extension:   b.config.AdditionalISOFiles[idx].TargetExtension,
+			ResultKey:   b.config.AdditionalISOFiles[idx].downloadPathKey,
+			TargetPath:  b.config.AdditionalISOFiles[idx].downloadPathKey,
+			Url:         b.config.AdditionalISOFiles[idx].ISOUrls,
+		})
+	}
+	steps = append(steps,
 		&stepUploadISO{},
+		&stepUploadAdditionalISOs{},
 		&stepStartVM{},
 		&common.StepHTTPServer{
 			HTTPDir:     b.config.HTTPDir,
@@ -96,7 +109,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		&stepConvertToTemplate{},
 		&stepFinalizeTemplateConfig{},
 		&stepSuccess{},
-	}
+	)
+
 	// Run the steps
 	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)

builder/proxmox/config.go

@@ -1,4 +1,4 @@
-//go:generate mapstructure-to-hcl2 -type Config,nicConfig,diskConfig,vgaConfig
+//go:generate mapstructure-to-hcl2 -type Config,nicConfig,diskConfig,vgaConfig,storageConfig
 
 package proxmox
 
@@ -8,6 +8,7 @@ import (
 	"log"
 	"net/url"
 	"os"
+	"strconv"
 	"strings"
 	"time"
 
@@ -64,6 +65,8 @@ type Config struct {
 
 	shouldUploadISO bool
 
+	AdditionalISOFiles []storageConfig `mapstructure:"additional_iso_files"`
+
 	ctx interpolate.Context
 }
 
@@ -87,6 +90,15 @@ type vgaConfig struct {
 	Type   string `mapstructure:"type"`
 	Memory int    `mapstructure:"memory"`
 }
+type storageConfig struct {
+	common.ISOConfig `mapstructure:",squash"`
+	Device           string `mapstructure:"device"`
+	ISOFile          string `mapstructure:"iso_file"`
+	ISOStoragePool   string `mapstructure:"iso_storage_pool"`
+	Unmount          bool   `mapstructure:"unmount"`
+	shouldUploadISO  bool
+	downloadPathKey  string
+}
 
 func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 	// Agent defaults to true
@@ -183,6 +195,61 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 			errs = packer.MultiErrorAppend(errs, fmt.Errorf("disk format must be specified for pool type %q", c.Disks[idx].StoragePoolType))
 		}
 	}
+	for idx := range c.AdditionalISOFiles {
+		// Check AdditionalISO config
+		// Either a pre-uploaded ISO should be referenced in iso_file, OR a URL
+		// (possibly to a local file) to an ISO file that will be downloaded and
+		// then uploaded to Proxmox.
+		if c.AdditionalISOFiles[idx].ISOFile != "" {
+			c.AdditionalISOFiles[idx].shouldUploadISO = false
+		} else {
+			c.AdditionalISOFiles[idx].downloadPathKey = "downloaded_additional_iso_path_" + strconv.Itoa(idx)
+			isoWarnings, isoErrors := c.AdditionalISOFiles[idx].ISOConfig.Prepare(&c.ctx)
+			errs = packer.MultiErrorAppend(errs, isoErrors...)
+			warnings = append(warnings, isoWarnings...)
+			c.AdditionalISOFiles[idx].shouldUploadISO = true
+		}
+		if c.AdditionalISOFiles[idx].Device == "" {
+			log.Printf("AdditionalISOFile %d Device not set, using default 'ide3'", idx)
+			c.AdditionalISOFiles[idx].Device = "ide3"
+		}
+		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].Device[3:]))
+			}
+			if busnumber == 2 {
+				errs = packer.MultiErrorAppend(errs, fmt.Errorf("IDE bus 2 is used by boot ISO"))
+			}
+			if busnumber > 3 {
+				errs = packer.MultiErrorAppend(errs, fmt.Errorf("IDE bus index can't be higher than 3"))
+			}
+		}
+		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].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].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].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].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"))
+		}
+	}
 	if c.SCSIController == "" {
 		log.Printf("SCSI controller not set, using default 'lsi'")
 		c.SCSIController = "lsi"