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

Merge remote-tracking branch 'patsissons/fix-initialization-state-diff' into release-0.4.0

Browse Source
This commit is contained in:
Dan Petersen 2021-01-02 22:25:39 +01:00
commit f09e008683
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
proxmoxtf/resource_virtual_environment_vm.go
View File

@ -2668,7 +2668,9 @@ func resourceVirtualEnvironmentVMReadCustom(d *schema.ResourceData, m interface{
ipConfigList[ipConfigIndex] = ipConfigItem ipConfigList[ipConfigIndex] = ipConfigItem
} }
initialization[mkResourceVirtualEnvironmentVMInitializationIPConfig] = ipConfigList[:ipConfigLast+1] if ipConfigLast >= 0 {
initialization[mkResourceVirtualEnvironmentVMInitializationIPConfig] = ipConfigList[:ipConfigLast+1]
}
if vmConfig.CloudInitPassword != nil || vmConfig.CloudInitSSHKeys != nil || vmConfig.CloudInitUsername != nil { if vmConfig.CloudInitPassword != nil || vmConfig.CloudInitSSHKeys != nil || vmConfig.CloudInitUsername != nil {
initializationUserAccount := map[string]interface{}{} initializationUserAccount := map[string]interface{}{}
@ -2700,7 +2702,7 @@ func resourceVirtualEnvironmentVMReadCustom(d *schema.ResourceData, m interface{
} else { } else {
initialization[mkResourceVirtualEnvironmentVMInitializationUserDataFileID] = "" initialization[mkResourceVirtualEnvironmentVMInitializationUserDataFileID] = ""
} }
} else { } else if len(initialization) > 0 {
initialization[mkResourceVirtualEnvironmentVMInitializationUserDataFileID] = "" initialization[mkResourceVirtualEnvironmentVMInitializationUserDataFileID] = ""
} }