opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.2.0 -> release/2.3.0

Browse Source 
* commit 'e267bc77f2f130b62bc088b9167633c6c5761e8e':
  修正：host undo convert失败
This commit is contained in:
邱剑
2018-11-13 11:38:02 +08:00
parent b1acc90be3 e267bc77f2
commit 84d7e390d4
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/tasks/guest_delete_task.go
+5
View File
@@ -25,6 +25,11 @@ func init() {
func (self *GuestDeleteTask) OnInit(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) {
guest := obj.(*models.SGuest)
host := guest.GetHost()
if guest.Hypervisor == models.HYPERVISOR_BAREMETAL && host.HostType != models.HOST_TYPE_BAREMETAL {
self.OnGuestStopComplete(ctx, obj, data)
return
}
self.SetStage("on_guest_stop_complete", nil)
err := guest.GetDriver().RequestStopGuestForDelete(ctx, guest, self)
if err != nil {