mirror of
https://github.com/yunionio/cloudpods.git
synced 2026-09-21 14:19:49 +08:00
避免因publickey为空导致重装系统失败
This commit is contained in:
@@ -583,16 +583,15 @@ func (region *SRegion) ReplaceSystemDisk(instanceId, imageId, passwd, publicKey
|
||||
},
|
||||
},
|
||||
OsProfile: &compute.OSProfile{
|
||||
AdminUsername: &instance.Properties.OsProfile.AdminUsername,
|
||||
AdminPassword: &passwd,
|
||||
LinuxConfiguration: &compute.LinuxConfiguration{
|
||||
SSH: &compute.SSHConfiguration{
|
||||
PublicKeys: &sshKeys,
|
||||
},
|
||||
},
|
||||
AdminUsername: &instance.Properties.OsProfile.AdminUsername,
|
||||
AdminPassword: &passwd,
|
||||
LinuxConfiguration: &compute.LinuxConfiguration{},
|
||||
},
|
||||
},
|
||||
}
|
||||
if len(publicKey) > 0 {
|
||||
params.OsProfile.LinuxConfiguration.SSH = &compute.SSHConfiguration{PublicKeys: &sshKeys}
|
||||
}
|
||||
if err := region.UpdateInstance(instanceId, params); err != nil {
|
||||
region.deleteDisk(diskId)
|
||||
return "", err
|
||||
|
||||
Reference in New Issue
Block a user