避免Azure绑定秘钥时stop机器

This commit is contained in:
屈轩
2018-11-14 15:40:52 +08:00
parent 5c09c64644
commit ea620ef7ca
4 changed files with 11 additions and 2 deletions
+1
View File
@@ -87,6 +87,7 @@ type IGuestDriver interface {
GetDeployStatus() ([]string, error)
ValidateResizeDisk(guest *SGuest, disk *SDisk, storage *SStorage) error
CanKeepDetachDisk() bool
IsNeedRestartForResetLoginInfo() bool
RequestDeleteDetachedDisk(ctx context.Context, disk *SDisk, task taskman.ITask, isPurge bool) error
StartGuestDetachdiskTask(ctx context.Context, userCred mcclient.TokenCredential, guest *SGuest, params *jsonutils.JSONDict, parentTaskId string) error
+2 -2
View File
@@ -1916,10 +1916,10 @@ func (self *SGuest) PerformDeploy(ctx context.Context, userCred mcclient.TokenCr
return nil, fmt.Errorf("Parse query body error")
}
// 变更密码/密钥时需要Restart才能生效。更新普通字段不需要Restart
// 变更密码/密钥时需要Restart才能生效。更新普通字段不需要Restart, Azure需要在运行状态下操作
doRestart := false
if kwargs.Contains("__delete_keypair__") || kwargs.Contains("keypair") {
doRestart = true
doRestart = self.GetDriver().IsNeedRestartForResetLoginInfo()
var kpId string
if !jsonutils.QueryBoolean(kwargs, "__delete_keypair__", false) {
keypair, _ := kwargs.GetString("keypair")