From 1719411868d78af41bbf5e1a1fa7bed8f6b15afc Mon Sep 17 00:00:00 2001
From: Zexi <zexi.li@qq.com>
Date: Wed, 24 Apr 2019 19:52:24 +0800
Subject: [PATCH] fix: baremetal server deploy auto restart not work

---
 pkg/compute/guestdrivers/baremetals.go     | 5 -----
 pkg/compute/guestdrivers/base.go           | 9 +++++++++
 pkg/compute/guestdrivers/virtualization.go | 9 ---------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkg/compute/guestdrivers/baremetals.go b/pkg/compute/guestdrivers/baremetals.go
index 96484eeaad..3d9d450276 100644
--- a/pkg/compute/guestdrivers/baremetals.go
+++ b/pkg/compute/guestdrivers/baremetals.go
@@ -365,11 +365,6 @@ func (self *SBaremetalGuestDriver) CheckDiskTemplateOnStorage(ctx context.Contex
 	return nil
 }
 
-func (self *SBaremetalGuestDriver) OnGuestDeployTaskComplete(ctx context.Context, guest *models.SGuest, task taskman.ITask) error {
-	task.SetStage("OnDeployGuestSyncstatusComplete", nil)
-	return guest.StartSyncstatus(ctx, task.GetUserCred(), task.GetTaskId())
-}
-
 func (self *SBaremetalGuestDriver) OnGuestDeployTaskDataReceived(ctx context.Context, guest *models.SGuest, task taskman.ITask, data jsonutils.JSONObject) error {
 	if data.Contains("disks") {
 		disks, _ := data.GetArray("disks")
diff --git a/pkg/compute/guestdrivers/base.go b/pkg/compute/guestdrivers/base.go
index 47fb9fe27d..0d05676538 100644
--- a/pkg/compute/guestdrivers/base.go
+++ b/pkg/compute/guestdrivers/base.go
@@ -281,3 +281,12 @@ func (self *SBaseGuestDriver) GetGuestSecgroupVpcid(guest *models.SGuest) (strin
 	}
 	return vpcId, nil
 }
+
+func (self *SBaseGuestDriver) OnGuestDeployTaskComplete(ctx context.Context, guest *models.SGuest, task taskman.ITask) error {
+	if jsonutils.QueryBoolean(task.GetParams(), "restart", false) {
+		task.SetStage("OnDeployStartGuestComplete", nil)
+		return guest.StartGueststartTask(ctx, task.GetUserCred(), nil, task.GetTaskId())
+	}
+	task.SetStage("OnDeployGuestSyncstatusComplete", nil)
+	return guest.StartSyncstatus(ctx, task.GetUserCred(), task.GetTaskId())
+}
diff --git a/pkg/compute/guestdrivers/virtualization.go b/pkg/compute/guestdrivers/virtualization.go
index 2d257c4372..418bfcdd04 100644
--- a/pkg/compute/guestdrivers/virtualization.go
+++ b/pkg/compute/guestdrivers/virtualization.go
@@ -172,15 +172,6 @@ func (self *SVirtualizedGuestDriver) RequestDeleteDetachedDisk(ctx context.Conte
 		jsonutils.QueryBoolean(task.GetParams(), "override_pending_delete", false))
 }
 
-func (self *SVirtualizedGuestDriver) OnGuestDeployTaskComplete(ctx context.Context, guest *models.SGuest, task taskman.ITask) error {
-	if jsonutils.QueryBoolean(task.GetParams(), "restart", false) {
-		task.SetStage("OnDeployStartGuestComplete", nil)
-		return guest.StartGueststartTask(ctx, task.GetUserCred(), nil, task.GetTaskId())
-	}
-	task.SetStage("OnDeployGuestSyncstatusComplete", nil)
-	return guest.StartSyncstatus(ctx, task.GetUserCred(), task.GetTaskId())
-}
-
 func (self *SVirtualizedGuestDriver) StartGuestSyncstatusTask(guest *models.SGuest, ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string) error {
 	task, err := taskman.TaskManager.NewTask(ctx, "GuestSyncstatusTask", guest, userCred, nil, parentTaskId, "", nil)
 	if err != nil {