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

fix(region): only kvm use qgs set password in guest running status (#15158)

Browse Source 
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>

Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
This commit is contained in:
wanyaoqi
2022-10-12 14:55:03 +08:00
committed by GitHub
parent 9f65fd6abb
commit 6d3a592833
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guest_actions.go
+2 -5
View File
@@ -723,8 +723,7 @@ func (self *SGuest) PerformClone(ctx context.Context, userCred mcclient.TokenCre
}
func (self *SGuest) PerformSetPassword(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, input api.ServerSetPasswordInput) (jsonutils.JSONObject, error) {
switch self.Status {
case api.VM_RUNNING:
if self.Hypervisor == api.HYPERVISOR_KVM && self.Status == api.VM_RUNNING {
inputQga := &api.ServerQgaSetPasswordInput{
Username: input.Username,
Password: input.Password,
@@ -740,15 +739,13 @@ func (self *SGuest) PerformSetPassword(ctx context.Context, userCred mcclient.To
inputQga.Password = seclib2.RandomPassword2(12)
}
return self.PerformQgaSetPassword(ctx, userCred, query, inputQga)
case api.VM_READY:
} else {
inputDeploy := api.ServerDeployInput{
Password: input.Password,
ResetPassword: input.ResetPassword,
AutoStart: input.AutoStart,
}
return self.PerformDeploy(ctx, userCred, query, inputDeploy)
default:
return nil, httperrors.NewServerStatusError("Cannot deploy in status %s", self.Status)
}
}
pkg/compute/tasks/guest_qga_reset_password_task.go
+1 -1
View File
@@ -98,7 +98,7 @@ func (self *GuestQgaSetPasswordTask) OnQgaSetUserPassword(ctx context.Context, g
guest.SetAllMetadata(ctx, info, self.UserCred)
}
logclient.AddActionLogWithContext(ctx, guest, logclient.ACT_SET_USER_PASSWORD, "", self.UserCred, true)
logclient.AddActionLogWithContext(ctx, guest, logclient.ACT_SET_USER_PASSWORD, "qga set password success", self.UserCred, true)
self.SetStageComplete(ctx, nil)
}