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 'fa1e7d7c4b2a909707db7b331ff110d91ef24e02':
  避免Azure重置密码后主机状态为ready状态
This commit is contained in:
邱剑
2018-11-12 19:46:22 +08:00
parent a2d7178d77 fa1e7d7c4b
commit 671f09d524
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/guestdrivers/virtualization.go
+2 -4
View File
@@ -147,11 +147,9 @@ func (self *SVirtualizedGuestDriver) OnGuestDeployTaskComplete(ctx context.Conte
if jsonutils.QueryBoolean(task.GetParams(), "restart", false) {
task.SetStage("OnDeployStartGuestComplete", nil)
return guest.StartGueststartTask(ctx, task.GetUserCred(), nil, task.GetTaskId())
} else {
guest.SetStatus(task.GetUserCred(), models.VM_READY, "ready")
task.SetStageComplete(ctx, nil)
return nil
}
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 {