opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-16 15:07:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1998 from swordqiu/hotfix/qj-managed-instance-deploy-publickey

Browse Source 
fix: managed instance password not correct when deploy with keypair
This commit is contained in:
yunion-ci-robot
2019-07-30 11:53:32 +08:00
committed by GitHub
parent 608c7c07e5 5f7a87fab7
commit 017e15eaa8
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/guestdrivers/managedvirtual.go
+3 -3
View File
@@ -414,7 +414,7 @@ func (self *SManagedVirtualizedGuestDriver) RemoteDeployGuestForCreate(ctx conte
return nil, err
}
data := fetchIVMinfo(desc, iVM, guest.Id, desc.Account, desc.Password, "create")
data := fetchIVMinfo(desc, iVM, guest.Id, desc.Account, desc.Password, desc.PublicKey, "create")
return data, nil
}
@@ -456,7 +456,7 @@ func (self *SManagedVirtualizedGuestDriver) RemoteDeployGuestForDeploy(ctx conte
return nil, err
}
data := fetchIVMinfo(desc, iVM, guest.Id, desc.Account, desc.Password, "deploy")
data := fetchIVMinfo(desc, iVM, guest.Id, desc.Account, desc.Password, desc.PublicKey, "deploy")
return data, nil
}
@@ -524,7 +524,7 @@ func (self *SManagedVirtualizedGuestDriver) RemoteDeployGuestForRebuildRoot(ctx
}
}
data := fetchIVMinfo(desc, iVM, guest.Id, desc.Account, desc.Password, "rebuild")
data := fetchIVMinfo(desc, iVM, guest.Id, desc.Account, desc.Password, desc.PublicKey, "rebuild")
return data, nil
}
pkg/compute/guestdrivers/utils.go
+11 -3
View File
@@ -23,6 +23,7 @@ import (
billing_api "yunion.io/x/onecloud/pkg/apis/billing"
"yunion.io/x/onecloud/pkg/cloudprovider"
"yunion.io/x/onecloud/pkg/util/seclib2"
)
type SDiskInfo struct {
@@ -43,7 +44,7 @@ type SDiskInfo struct {
Metadata map[string]string
}
func fetchIVMinfo(desc cloudprovider.SManagedVMCreateConfig, iVM cloudprovider.ICloudVM, guestId string, account, passwd string, action string) *jsonutils.JSONDict {
func fetchIVMinfo(desc cloudprovider.SManagedVMCreateConfig, iVM cloudprovider.ICloudVM, guestId string, account, passwd string, publicKey string, action string) *jsonutils.JSONDict {
data := jsonutils.NewDict()
data.Add(jsonutils.NewString(iVM.GetOSType()), "os")
@@ -51,11 +52,18 @@ func fetchIVMinfo(desc cloudprovider.SManagedVMCreateConfig, iVM cloudprovider.I
//避免在rebuild_root时绑定秘钥,没有account信息
data.Add(jsonutils.NewString(account), "account")
if len(passwd) > 0 {
encpasswd, err := utils.EncryptAESBase64(guestId, passwd)
var encpasswd string
var err error
if len(publicKey) > 0 {
encpasswd, err = seclib2.EncryptBase64(publicKey, passwd)
} else {
encpasswd, err = utils.EncryptAESBase64(guestId, passwd)
}
if err != nil {
log.Errorf("encrypt password failed %s", err)
} else {
data.Add(jsonutils.NewString(encpasswd), "key")
}
data.Add(jsonutils.NewString(encpasswd), "key")
}
if len(desc.OsDistribution) > 0 {