Merge pull request #108 from claudusd/keep_id_updateconfig_fail

Set id when updateconfig fail
This commit is contained in:
Grant Gongaware 2019-11-04 09:55:23 -08:00 committed by GitHub
commit 0f7edc67dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -392,9 +392,9 @@ func resourceVmQemu() *schema.Resource {
Optional: true,
},
"ipconfig2": {
Type: schema.TypeString,
Optional: true,
},
Type: schema.TypeString,
Optional: true,
},
"preprovision": {
Type: schema.TypeBool,
Optional: true,
@ -517,6 +517,8 @@ func resourceVmQemuCreate(d *schema.ResourceData, meta interface{}) error {
log.Print("[DEBUG] cloning VM")
err = config.CloneVm(sourceVmr, vmr, client)
if err != nil {
// Set the id because when update config fail the vm is still created
d.SetId(resourceId(targetNode, "qemu", vmr.VmId()))
pmParallelEnd(pconf)
return err
}
@ -547,6 +549,8 @@ func resourceVmQemuCreate(d *schema.ResourceData, meta interface{}) error {
err := config.UpdateConfig(vmr, client)
if err != nil {
// Set the id because when update config fail the vm is still created
d.SetId(resourceId(targetNode, "qemu", vmr.VmId()))
pmParallelEnd(pconf)
return err
}