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

Merge pull request #466 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-deploy to release/2.2.0

Browse Source 
* commit '50889e374fcdbfd00ed895d05176daa4ce24710f':
  避免Azure重置密码后主机状态为ready状态
This commit is contained in:
邱剑
2018-11-12 19:46:21 +08:00
parent 0b41ec34c9 50889e374f
commit fa1e7d7c4b
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
@@ -124,11 +124,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 {