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

修正：阿里云主机创建后自动启动失败

Browse Source
This commit is contained in:
Qiu Jian
2018-08-25 09:24:05 +08:00
parent 183405a31d
commit b16613a0e6
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/guestdrivers/aliyun.go
+5 -4
View File
@@ -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 {
pkg/compute/tasks/guest_create_task.go
+2 -2
View File
@@ -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())
}
}*/
pkg/compute/tasks/guest_start_task.go
+1
View File
@@ -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()))
}