Merge pull request #8892 from zaventh/feature/vga-adapter

feat(proxmox): add ability to specify vga adapter
hashicorp · Mar 17, 2020 · dc9259f · dc9259f
2 parents 0d454f1 + e503afb
commit dc9259f
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 2 deletions.
diff --git a/builder/proxmox/config.go b/builder/proxmox/config.go
@@ -1,4 +1,4 @@
-//go:generate mapstructure-to-hcl2 -type Config,nicConfig,diskConfig
+//go:generate mapstructure-to-hcl2 -type Config,nicConfig,diskConfig,vgaConfig
 
 package proxmox
 
@@ -45,6 +45,7 @@ type Config struct {
 	CPUType        string       `mapstructure:"cpu_type"`
 	Sockets        int          `mapstructure:"sockets"`
 	OS             string       `mapstructure:"os"`
+	VGA            vgaConfig    `mapstructure:"vga"`
 	NICs           []nicConfig  `mapstructure:"network_adapters"`
 	Disks          []diskConfig `mapstructure:"disks"`
 	ISOFile        string       `mapstructure:"iso_file"`
@@ -75,6 +76,10 @@ type diskConfig struct {
 	CacheMode       string `mapstructure:"cache_mode"`
 	DiskFormat      string `mapstructure:"format"`
 }
+type vgaConfig struct {
+	Type   string `mapstructure:"type"`
+	Memory int    `mapstructure:"memory"`
+}
 
 func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 	// Agent defaults to true

diff --git a/builder/proxmox/config.hcl2spec.go b/builder/proxmox/config.hcl2spec.go
diff --git a/builder/proxmox/step_start_vm.go b/builder/proxmox/step_start_vm.go
@@ -39,6 +39,7 @@ func (s *stepStartVM) Run(ctx context.Context, state multistep.StateBag) multist
 		QemuCores:    c.Cores,
 		QemuSockets:  c.Sockets,
 		QemuOs:       c.OS,
+		QemuVga:      generateProxmoxVga(c.VGA),
 		QemuIso:      isoFile,
 		QemuNetworks: generateProxmoxNetworkAdapters(c.NICs),
 		QemuDisks:    generateProxmoxDisks(c.Disks),
@@ -118,6 +119,15 @@ func generateProxmoxDisks(disks []diskConfig) proxmox.QemuDevices {
 	}
 	return devs
 }
+func generateProxmoxVga(vga vgaConfig) proxmox.QemuDevice {
+	dev := make(proxmox.QemuDevice)
+	setDeviceParamIfDefined(dev, "type", vga.Type)
+
+	if vga.Memory > 0 {
+		dev["memory"] = vga.Memory
+	}
+	return dev
+}
 
 func setDeviceParamIfDefined(dev proxmox.QemuDevice, key, value string) {
 	if value != "" {

diff --git a/website/source/docs/builders/proxmox.html.md b/website/source/docs/builders/proxmox.html.md
@@ -95,6 +95,21 @@ builder.
     `wvista`, `win7`, `win8`, `win10`, `l24` (Linux 2.4), `l26` (Linux 2.6+),
     `solaris` or `other`. Defaults to `other`.
 
+-   `vga` (object) - The graphics adapter to use. Example:
+
+    ```json
+    {
+      "type": "vmware",
+      "memory": 32
+    }
+    ```
+
+    -   `type` (string) - Can be `cirrus`, `none`, `qxl`,`qxl2`, `qxl3`,
+    `qxl4`, `serial0`, `serial1`, `serial2`, `serial3`, `std`, `virtio`, `vmware`.
+    Defaults to `std`.
+
+    -   `memory` (int) - How much memory to assign.
+
 -   `network_adapters` (array of objects) - Network adapters attached to the
     virtual machine. Example: