mirrors/terraform-provider-proxmox
0
0
Fork 0
mirror of https://github.com/bpg/terraform-provider-proxmox.git synced 2025-07-05 13:33:58 +00:00
Code

Fixed vCPU update issue

Browse Source
This commit is contained in:
Dan Petersen 2019-12-31 06:25:40 +01:00
parent ea0c17bfca
commit 9ea1cdba2c
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
proxmox/virtual_environment_vm_types.go
View File

@ -216,6 +216,7 @@ type VirtualEnvironmentVMCreateRequestBody struct {
CPUSockets *int `json:"sockets,omitempty" url:"sockets,omitempty"` CPUSockets *int `json:"sockets,omitempty" url:"sockets,omitempty"`
CPUUnits *int `json:"cpuunits,omitempty" url:"cpuunits,omitempty"` CPUUnits *int `json:"cpuunits,omitempty" url:"cpuunits,omitempty"`
DedicatedMemory *int `json:"memory,omitempty" url:"memory,omitempty"` DedicatedMemory *int `json:"memory,omitempty" url:"memory,omitempty"`
Delete []string `json:"delete,omitempty" url:"delete,omitempty,comma"`
DeletionProtection *CustomBool `json:"protection,omitempty" url:"force,omitempty,int"` DeletionProtection *CustomBool `json:"protection,omitempty" url:"force,omitempty,int"`
Description *string `json:"description,omitempty" url:"description,omitempty"` Description *string `json:"description,omitempty" url:"description,omitempty"`
EFIDisk *CustomEFIDisk `json:"efidisk0,omitempty" url:"efidisk0,omitempty"` EFIDisk *CustomEFIDisk `json:"efidisk0,omitempty" url:"efidisk0,omitempty"`

26
proxmoxtf/resource_virtual_environment_vm.go
View File

@ -2013,6 +2013,7 @@ func resourceVirtualEnvironmentVMUpdate(d *schema.ResourceData, m interface{}) e
} }
// Prepare the new primitive configuration values. // Prepare the new primitive configuration values.
delete := []string{}
description := d.Get(mkResourceVirtualEnvironmentVMDescription).(string) description := d.Get(mkResourceVirtualEnvironmentVMDescription).(string)
keyboardLayout := d.Get(mkResourceVirtualEnvironmentVMKeyboardLayout).(string) keyboardLayout := d.Get(mkResourceVirtualEnvironmentVMKeyboardLayout).(string)
name := d.Get(mkResourceVirtualEnvironmentVMName).(string) name := d.Get(mkResourceVirtualEnvironmentVMName).(string)
@ -2113,29 +2114,20 @@ func resourceVirtualEnvironmentVMUpdate(d *schema.ResourceData, m interface{}) e
} }
cpuCores := cpuBlock[mkResourceVirtualEnvironmentVMCPUCores].(int) cpuCores := cpuBlock[mkResourceVirtualEnvironmentVMCPUCores].(int)
if cpuCores > 0 {
body.CPUCores = &cpuCores
}
cpuFlags := cpuBlock[mkResourceVirtualEnvironmentVMCPUFlags].([]interface{}) cpuFlags := cpuBlock[mkResourceVirtualEnvironmentVMCPUFlags].([]interface{})
cpuHotplugged := cpuBlock[mkResourceVirtualEnvironmentVMCPUHotplugged].(int) cpuHotplugged := cpuBlock[mkResourceVirtualEnvironmentVMCPUHotplugged].(int)
if cpuHotplugged > 0 {
body.VirtualCPUCount = &cpuHotplugged
}
cpuSockets := cpuBlock[mkResourceVirtualEnvironmentVMCPUSockets].(int) cpuSockets := cpuBlock[mkResourceVirtualEnvironmentVMCPUSockets].(int)
if cpuSockets > 0 {
body.CPUSockets = &cpuSockets
}
cpuType := cpuBlock[mkResourceVirtualEnvironmentVMCPUType].(string) cpuType := cpuBlock[mkResourceVirtualEnvironmentVMCPUType].(string)
cpuUnits := cpuBlock[mkResourceVirtualEnvironmentVMCPUUnits].(int) cpuUnits := cpuBlock[mkResourceVirtualEnvironmentVMCPUUnits].(int)
if cpuUnits > 0 { body.CPUCores = &cpuCores
body.CPUSockets = &cpuSockets
body.CPUUnits = &cpuUnits body.CPUUnits = &cpuUnits
if cpuHotplugged > 0 {
body.VirtualCPUCount = &cpuHotplugged
} else {
delete = append(delete, "vcpus")
} }
cpuFlagsConverted := make([]string, len(cpuFlags)) cpuFlagsConverted := make([]string, len(cpuFlags))
@ -2244,6 +2236,8 @@ func resourceVirtualEnvironmentVMUpdate(d *schema.ResourceData, m interface{}) e
} }
// Update the configuration now that everything has been prepared. // Update the configuration now that everything has been prepared.
body.Delete = delete
err = veClient.UpdateVM(nodeName, vmID, body) err = veClient.UpdateVM(nodeName, vmID, body)
if err != nil { if err != nil {