From b16613a0e6de1fcacf9c42e438133ca9d3b2f05f Mon Sep 17 00:00:00 2001
From: Qiu Jian <qiujian@yunionyun.com>
Date: Sat, 25 Aug 2018 09:24:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E9=98=BF=E9=87=8C?=
 =?UTF-8?q?=E4=BA=91=E4=B8=BB=E6=9C=BA=E5=88=9B=E5=BB=BA=E5=90=8E=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=90=AF=E5=8A=A8=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/compute/guestdrivers/aliyun.go     | 9 +++++----
 pkg/compute/tasks/guest_create_task.go | 4 ++--
 pkg/compute/tasks/guest_start_task.go  | 1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkg/compute/guestdrivers/aliyun.go b/pkg/compute/guestdrivers/aliyun.go
index 50ebab0f8d..673c4f1b1b 100644
--- a/pkg/compute/guestdrivers/aliyun.go
+++ b/pkg/compute/guestdrivers/aliyun.go
@@ -125,10 +125,11 @@ type SDiskInfo struct {
 func (self *SAliyunGuestDriver) RequestDeployGuestOnHost(ctx context.Context, guest *models.SGuest, host *models.SHost, task taskman.ITask) error {
 	config := guest.GetDeployConfigOnHost(ctx, host, task.GetParams())
 
-	onfinish, err := config.GetString("on_finish")
+	/* onfinish, err := config.GetString("on_finish")
 	if err != nil {
 		return err
-	}
+	} */
+	
 	action, err := config.GetString("action")
 	if err != nil {
 		return err
@@ -170,12 +171,12 @@ func (self *SAliyunGuestDriver) RequestDeployGuestOnHost(ctx context.Context, gu
 			return nil, err
 		}
 
-		if onfinish == "none" {
+		/* if onfinish == "none" {
 			err = iVM.StartVM()
 			if err != nil {
 				return nil, err
 			}
-		}
+		} */
 
 		encpasswd, err := utils.EncryptAESBase64(guest.Id, passwd)
 		if err != nil {
diff --git a/pkg/compute/tasks/guest_create_task.go b/pkg/compute/tasks/guest_create_task.go
index a57f49afca..1248fe287e 100644
--- a/pkg/compute/tasks/guest_create_task.go
+++ b/pkg/compute/tasks/guest_create_task.go
@@ -105,7 +105,7 @@ func (self *GuestCreateTask) OnDeployGuestDescCompleteFailed(ctx context.Context
 	notifyclient.NotifySystemError(guest.Id, guest.Name, models.VM_DEPLOY_FAILED, data.String())
 }
 
-func (self *GuestCreateTask) OnAutoStartGuest(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) {
+/*func (self *GuestCreateTask) OnAutoStartGuest(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) {
 	guest := obj.(*models.SGuest)
 	self.SetStageComplete(ctx, guest.GetShortDesc())
 }
@@ -113,4 +113,4 @@ func (self *GuestCreateTask) OnAutoStartGuest(ctx context.Context, obj db.IStand
 func (self *GuestCreateTask) OnSyncStatusComplete(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) {
 	guest := obj.(*models.SGuest)
 	self.SetStageComplete(ctx, guest.GetShortDesc())
-}
+}*/
diff --git a/pkg/compute/tasks/guest_start_task.go b/pkg/compute/tasks/guest_start_task.go
index 3d910543a6..8be672f918 100644
--- a/pkg/compute/tasks/guest_start_task.go
+++ b/pkg/compute/tasks/guest_start_task.go
@@ -72,6 +72,7 @@ func (self *GuestStartTask) OnStartCompleteFailed(ctx context.Context, obj db.IS
 }
 
 func (self *GuestStartTask) onStartGuestFailed(ctx context.Context, guest *models.SGuest, err error) {
+	guest.SetStatus(self.UserCred, models.VM_START_FAILED, err.Error())
 	self.SetStageFailed(ctx, err.Error())
 	self.OnStartCompleteFailed(ctx, guest, jsonutils.NewString(err.Error()))
 }