Merge pull request #284 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-azure-rebuild-root to release/2.2.0

* commit '6433953d9fefa539e98ee323f905075187fc9d26':
  避免因publickey为空导致重装系统失败
This commit is contained in:
邱剑
2018-10-11 18:11:03 +08:00
+6 -7
View File
@@ -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