opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.3.0 -> release/2.4.0

Browse Source 
* commit '070a7f08a890bfc2b0754c7b07d0e56e473c8f4b':
  修正：vmware主机获取账号信息失败
This commit is contained in:
邱剑
2018-11-21 21:28:56 +08:00
parent 6b7a952159 070a7f08a8
commit b5c26e46c4
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cloudproviders.go
+9 -1
View File
@@ -400,7 +400,15 @@ func (self *SCloudprovider) getAccount() (SAccount, error) {
cloudaccount := self.GetCloudaccount()
if cloudaccount == nil {
return account, fmt.Errorf("fail to find cloudaccount???")
// legacy mode
passwd, err := self.getPassword()
if err != nil {
return account, err
}
account.Account = self.Account
account.AccessUrl = self.AccessUrl
account.Secret = passwd
return account, nil // fmt.Errorf("fail to find cloudaccount???")
}
passwd, err := cloudaccount.getPassword()