mirrors/terraform-provider-proxmox
0
0
Fork 0
mirror of https://github.com/bpg/terraform-provider-proxmox.git synced 2025-07-03 12:02:57 +00:00
Code

Continued work on VM update logic

Browse Source
This commit is contained in:
Dan Petersen 2019-12-30 05:29:19 +01:00
parent 6dd3cb454c
commit ad6fe2c6ea
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
proxmoxtf/resource_virtual_environment_vm.go
View File

@ -1757,6 +1757,7 @@ func resourceVirtualEnvironmentVMUpdate(d *schema.ResourceData, m interface{}) e
// Prepare the new primitive configuration values. // Prepare the new primitive configuration values.
description := d.Get(mkResourceVirtualEnvironmentVMDescription).(string) description := d.Get(mkResourceVirtualEnvironmentVMDescription).(string)
keyboardLayout := d.Get(mkResourceVirtualEnvironmentVMKeyboardLayout).(string)
name := d.Get(mkResourceVirtualEnvironmentVMName).(string) name := d.Get(mkResourceVirtualEnvironmentVMName).(string)
osType := d.Get(mkResourceVirtualEnvironmentVMOSType).(string) osType := d.Get(mkResourceVirtualEnvironmentVMOSType).(string)
@ -1764,12 +1765,35 @@ func resourceVirtualEnvironmentVMUpdate(d *schema.ResourceData, m interface{}) e
body.Description = &description body.Description = &description
} }
body.KeyboardLayout = &keyboardLayout
if name != "" { if name != "" {
body.Name = &name body.Name = &name
} }
body.OSType = &osType body.OSType = &osType
// Prepare the new agent configuration.
if d.HasChange(mkResourceVirtualEnvironmentVMAgent) {
agentBlock, err := getSchemaBlock(resource, d, m, []string{mkResourceVirtualEnvironmentVMAgent}, 0, true)
if err != nil {
return err
}
agentEnabled := proxmox.CustomBool(agentBlock[mkResourceVirtualEnvironmentVMAgentEnabled].(bool))
agentTrim := proxmox.CustomBool(agentBlock[mkResourceVirtualEnvironmentVMAgentTrim].(bool))
agentType := agentBlock[mkResourceVirtualEnvironmentVMAgentType].(string)
body.Agent = &proxmox.CustomAgent{
Enabled: &agentEnabled,
TrimClonedDisks: &agentTrim,
Type: &agentType,
}
rebootRequired = true
}
// Prepare the new CPU configuration. // Prepare the new CPU configuration.
if d.HasChange(mkResourceVirtualEnvironmentVMCPU) { if d.HasChange(mkResourceVirtualEnvironmentVMCPU) {
cpuBlock, err := getSchemaBlock(resource, d, m, []string{mkResourceVirtualEnvironmentVMCPU}, 0, true) cpuBlock, err := getSchemaBlock(resource, d, m, []string{mkResourceVirtualEnvironmentVMCPU}, 0, true)
@ -1846,7 +1870,6 @@ func resourceVirtualEnvironmentVMUpdate(d *schema.ResourceData, m interface{}) e
// Determine if the state of the virtual machine needs to be changed. // Determine if the state of the virtual machine needs to be changed.
if d.HasChange(mkResourceVirtualEnvironmentVMStarted) { if d.HasChange(mkResourceVirtualEnvironmentVMStarted) {
rebootRequired = false
started := d.Get(mkResourceVirtualEnvironmentVMStarted).(bool) started := d.Get(mkResourceVirtualEnvironmentVMStarted).(bool)
if started { if started {
@ -1879,6 +1902,8 @@ func resourceVirtualEnvironmentVMUpdate(d *schema.ResourceData, m interface{}) e
if err != nil { if err != nil {
return err return err
} }
rebootRequired = false
} }
} }