public/terraform-provider-proxmox
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-proxmox.git synced 2024-09-27 21:46:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into feature/mbps

Browse Source
This commit is contained in:
Virgil 2019-12-06 20:02:46 +01:00
commit 6894c00bfd
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/cloudinit_example.tf
View File

@ -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"

2
go.mod
View File

@ -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-20191206171242-991c5ce7826d
github.com/hashicorp/terraform v0.12.10
)

2
go.sum
View File

@ -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-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=

8
proxmox/resource_vm_qemu.go
View File

@ -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,
@ -476,6 +481,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),
@ -666,6 +672,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),
@ -764,6 +771,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)