From 8a737fff733e45718002c85d4227cdb0ece0f508 Mon Sep 17 00:00:00 2001 From: ioito Date: Mon, 22 Apr 2019 12:33:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=81=BF=E5=85=8Dqcloud=20password=E5=92=8Ckey?= =?UTF-8?q?pair=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/util/qcloud/instance.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/util/qcloud/instance.go b/pkg/util/qcloud/instance.go index 8f7c637d69..21f009faec 100644 --- a/pkg/util/qcloud/instance.go +++ b/pkg/util/qcloud/instance.go @@ -683,14 +683,16 @@ func (self *SRegion) ReplaceSystemDisk(instanceId string, imageId string, passwd params["ImageId"] = imageId params["EnhancedService.SecurityService.Enabled"] = "TRUE" params["EnhancedService.MonitorService.Enabled"] = "TRUE" - if len(passwd) > 0 { + + // 秘钥和密码及保留镜像设置只能选其一 + if len(keypairName) > 0 { + params["LoginSettings.KeyIds.0"] = keypairName + } else if len(passwd) > 0 { params["LoginSettings.Password"] = passwd } else { params["LoginSettings.KeepImageLogin"] = "TRUE" } - if len(keypairName) > 0 { - params["LoginSettings.KeyIds.0"] = keypairName - } + if sysDiskSizeGB > 0 { params["SystemDisk.DiskSize"] = fmt.Sprintf("%d", sysDiskSizeGB) }