Merge pull request #5265 from rainzm/automated-cherry-pick-of-#5263-upstream-release-3.1

Automated cherry pick of #5263: fix(esxiagent): SSHKey was not unmarshalled correctly
This commit is contained in:
yunion-ci-robot
2020-02-27 07:11:14 +08:00
committed by GitHub
+1 -1
View File
@@ -246,7 +246,7 @@ func (as *SAgentStorage) AgentDeployGuest(ctx context.Context, data interface{})
rootPath := disks[0].(*esxi.SVirtualDisk).GetFilename()
key := deployapi.SSHKeys{}
err = dataDict.Unmarshal(&key, "desc")
err = dataDict.Unmarshal(&key)
if err != nil {
return nil, errors.Wrapf(err, "%s: unmarshal to deployapi.SSHKeys", hostutils.ParamsError.Error())
}