Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix typo that undeploys vapp instead of vm while deleting a vm #261

Merged
merged 3 commits into from
Jun 26, 2019
Merged

fix typo that undeploys vapp instead of vm while deleting a vm #261

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe18bee
fix typo that undeploys vapp instead of vm
Jun 10, 2019
9c94963
Merge branch 'master' into scaling-down-vms-in-vapp-restarts-vapp
Jun 14, 2019
7f6125d
Remove the vapp deployment after vm deletion
Jun 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions vcd/resource_vcd_vapp_vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,15 +825,15 @@ func resourceVcdVAppVmDelete(d *schema.ResourceData, meta interface{}) error {
return fmt.Errorf("error getting VM4 : %#v", err)
}

status, err := vapp.GetStatus()
status, err := vm.GetStatus()
if err != nil {
return fmt.Errorf("error getting vApp status: %#v", err)
return fmt.Errorf("error getting VM status: %#v", err)
}

log.Printf("[TRACE] vApp Status:: %s", status)
log.Printf("[TRACE] VM Status:: %s", status)
if status != "POWERED_OFF" {
log.Printf("[TRACE] Undeploying vApp: %s", vapp.VApp.Name)
task, err := vapp.Undeploy()
log.Printf("[TRACE] Undeploying VM: %s", vm.VM.Name)
task, err := vm.Undeploy()
if err != nil {
return fmt.Errorf("error Undeploying: %#v", err)
}
Expand Down