Merge pull request #7543 from carlpett/proxmox-docs-and-ports

Proxmox docs and ports

builder/proxmox/step_type_boot_command.go

@@ -26,7 +26,7 @@ type stepTypeBootCommand struct {
 
 type bootCommandTemplateData struct {
 	HTTPIP   string
-	HTTPPort uint
+	HTTPPort int
 }
 
 type commandTyper interface {
@@ -66,7 +66,7 @@ func (s *stepTypeBootCommand) Run(ctx context.Context, state multistep.StateBag)
 	common.SetHTTPIP(httpIP)
 	s.Ctx.Data = &bootCommandTemplateData{
 		HTTPIP:   httpIP,
-		HTTPPort: state.Get("http_port").(uint),
+		HTTPPort: state.Get("http_port").(int),
 	}
 
 	ui.Say("Typing the boot command")

builder/proxmox/step_type_boot_command_test.go

@@ -106,7 +106,7 @@ func TestTypeBootCommand(t *testing.T) {
 			state := new(multistep.BasicStateBag)
 			state.Put("ui", packer.TestUi(t))
 			state.Put("config", c.builderConfig)
-			state.Put("http_port", uint(0))
+			state.Put("http_port", int(0))
 			state.Put("vmRef", proxmox.NewVmRef(1))
 			state.Put("proxmoxClient", typer)
 

website/source/docs/builders/proxmox.html.md

@@ -71,8 +71,9 @@ builder.
 -   `sockets` (int) - How many CPU sockets to give the virtual machine.
     Defaults to `1`
 
--   `os` (string) - The operating system. Can be `linux`, `windows`, `solaris`
-    or `other`. Defaults to `other`.
+-   `os` (string) - The operating system. Can be `wxp`, `w2k`, `w2k3`, `w2k8`,
+    `wvista`, `win7`, `win8`, `win10`, `l24` (Linux 2.4), `l26` (Linux 2.6+),
+    `solaris` or `other`. Defaults to `other`.
 
 -   `network_adapters` (array of objects) - Network adapters attached to the
     virtual machine. Example: