From 97ee971bbee651debc32367414381d1dd4885635 Mon Sep 17 00:00:00 2001 From: Virgil Date: Thu, 5 Dec 2019 14:41:10 +0100 Subject: [PATCH 1/3] Add vcpus feature --- examples/cloudinit_example.tf | 1 + proxmox/resource_vm_qemu.go | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/examples/cloudinit_example.tf b/examples/cloudinit_example.tf index 0974429e..ef6d5e86 100644 --- a/examples/cloudinit_example.tf +++ b/examples/cloudinit_example.tf @@ -26,6 +26,7 @@ resource "proxmox_vm_qemu" "cloudinit-test" { os_type = "cloud-init" cores = "2" sockets = "1" + vcpus = "0" cpu = "host" memory = "2048" scsihw = "lsi" diff --git a/proxmox/resource_vm_qemu.go b/proxmox/resource_vm_qemu.go index 0b8ba395..17dafa8e 100644 --- a/proxmox/resource_vm_qemu.go +++ b/proxmox/resource_vm_qemu.go @@ -106,6 +106,11 @@ func resourceVmQemu() *schema.Resource { Optional: true, Default: 1, }, + "vcpus": { + Type: schema.TypeInt, + Optional: true, + Default: 0, + }, "cpu": { Type: schema.TypeString, Optional: true, @@ -446,6 +451,7 @@ func resourceVmQemuCreate(d *schema.ResourceData, meta interface{}) error { Memory: d.Get("memory").(int), QemuCores: d.Get("cores").(int), QemuSockets: d.Get("sockets").(int), + QemuVcpus: d.Get("vcpus").(int), QemuCpu: d.Get("cpu").(string), QemuNuma: d.Get("numa").(bool), Hotplug: d.Get("hotplug").(string), @@ -636,6 +642,7 @@ func resourceVmQemuUpdate(d *schema.ResourceData, meta interface{}) error { Memory: d.Get("memory").(int), QemuCores: d.Get("cores").(int), QemuSockets: d.Get("sockets").(int), + QemuVcpus: d.Get("vcpus").(int), QemuCpu: d.Get("cpu").(string), QemuNuma: d.Get("numa").(bool), Hotplug: d.Get("hotplug").(string), @@ -734,6 +741,7 @@ func resourceVmQemuRead(d *schema.ResourceData, meta interface{}) error { d.Set("memory", config.Memory) d.Set("cores", config.QemuCores) d.Set("sockets", config.QemuSockets) + d.Set("vcpus", config.QemuVcpus) d.Set("cpu", config.QemuCpu) d.Set("numa", config.QemuNuma) d.Set("hotplug", config.Hotplug) From 48cfb7915377c8c76bd96bb8430142207e9abd06 Mon Sep 17 00:00:00 2001 From: Virgil Date: Thu, 5 Dec 2019 18:52:39 +0100 Subject: [PATCH 2/3] Update API --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 47a8f03b..b65012f2 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,6 @@ module github.com/Telmate/terraform-provider-proxmox go 1.13 require ( - github.com/Telmate/proxmox-api-go v0.0.0-20191202165429-ba1b7dd050aa + github.com/Telmate/proxmox-api-go v0.0.0-20191205173040-099b4de8d7db github.com/hashicorp/terraform v0.12.10 ) diff --git a/go.sum b/go.sum index f4dea4c2..7fd7b667 100644 --- a/go.sum +++ b/go.sum @@ -21,6 +21,8 @@ github.com/Telmate/proxmox-api-go v0.0.0-20191104165655-ab21e7f8ad14 h1:5YRnEl50 github.com/Telmate/proxmox-api-go v0.0.0-20191104165655-ab21e7f8ad14/go.mod h1:OGWyIMJ87/k/GCz8CGiWB2HOXsOVDM6Lpe/nFPkC4IQ= github.com/Telmate/proxmox-api-go v0.0.0-20191202165429-ba1b7dd050aa h1:Ypr/7Agl67RX/6iQ3fW+tHJPul14xFwttXC0d5xNdxg= github.com/Telmate/proxmox-api-go v0.0.0-20191202165429-ba1b7dd050aa/go.mod h1:OGWyIMJ87/k/GCz8CGiWB2HOXsOVDM6Lpe/nFPkC4IQ= +github.com/Telmate/proxmox-api-go v0.0.0-20191205173040-099b4de8d7db h1:dXp34wZOfSCrUF6y/bKN/064VKTkSB1/xt5VHXV7WS8= +github.com/Telmate/proxmox-api-go v0.0.0-20191205173040-099b4de8d7db/go.mod h1:OGWyIMJ87/k/GCz8CGiWB2HOXsOVDM6Lpe/nFPkC4IQ= github.com/Unknwon/com v0.0.0-20151008135407-28b053d5a292/go.mod h1:KYCjqMOeHpNuTOiFQU6WEcTG7poCJrUs0YgyHNtn1no= github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod h1:5Jv4cbFiHJMsVxt52+i0Ha45fjshj6wxYr1r19tB9bw= github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= From 6dc3e0c03190d8b02f8751336fbe6b7cc5b68546 Mon Sep 17 00:00:00 2001 From: Virgil Date: Fri, 6 Dec 2019 18:48:03 +0100 Subject: [PATCH 3/3] Update lib --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b65012f2..6f990624 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,6 @@ module github.com/Telmate/terraform-provider-proxmox go 1.13 require ( - github.com/Telmate/proxmox-api-go v0.0.0-20191205173040-099b4de8d7db + github.com/Telmate/proxmox-api-go v0.0.0-20191206171242-991c5ce7826d github.com/hashicorp/terraform v0.12.10 ) diff --git a/go.sum b/go.sum index 7fd7b667..adf7bc90 100644 --- a/go.sum +++ b/go.sum @@ -21,8 +21,8 @@ github.com/Telmate/proxmox-api-go v0.0.0-20191104165655-ab21e7f8ad14 h1:5YRnEl50 github.com/Telmate/proxmox-api-go v0.0.0-20191104165655-ab21e7f8ad14/go.mod h1:OGWyIMJ87/k/GCz8CGiWB2HOXsOVDM6Lpe/nFPkC4IQ= github.com/Telmate/proxmox-api-go v0.0.0-20191202165429-ba1b7dd050aa h1:Ypr/7Agl67RX/6iQ3fW+tHJPul14xFwttXC0d5xNdxg= github.com/Telmate/proxmox-api-go v0.0.0-20191202165429-ba1b7dd050aa/go.mod h1:OGWyIMJ87/k/GCz8CGiWB2HOXsOVDM6Lpe/nFPkC4IQ= -github.com/Telmate/proxmox-api-go v0.0.0-20191205173040-099b4de8d7db h1:dXp34wZOfSCrUF6y/bKN/064VKTkSB1/xt5VHXV7WS8= -github.com/Telmate/proxmox-api-go v0.0.0-20191205173040-099b4de8d7db/go.mod h1:OGWyIMJ87/k/GCz8CGiWB2HOXsOVDM6Lpe/nFPkC4IQ= +github.com/Telmate/proxmox-api-go v0.0.0-20191206171242-991c5ce7826d h1:OPRNmtQcU2EvGndXfW+G/rg3DYAxSoyHbWGCdG48Vg0= +github.com/Telmate/proxmox-api-go v0.0.0-20191206171242-991c5ce7826d/go.mod h1:OGWyIMJ87/k/GCz8CGiWB2HOXsOVDM6Lpe/nFPkC4IQ= github.com/Unknwon/com v0.0.0-20151008135407-28b053d5a292/go.mod h1:KYCjqMOeHpNuTOiFQU6WEcTG7poCJrUs0YgyHNtn1no= github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod h1:5Jv4cbFiHJMsVxt52+i0Ha45fjshj6wxYr1r19tB9bw= github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=