opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #946 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-account to release/2.5.0

Browse Source 
* commit 'b16bc5d2cb39d912696f8503dfa3cc638e42fb8d':
  修复openstack项目及用户名顺序颠倒问题
This commit is contained in:
邱剑
2019-01-19 13:21:19 +08:00
parent 56cd5919d6 b16bc5d2cb
commit bbcea5e8dc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/openstack/provider/provider.go
+3 -3
View File
@@ -74,10 +74,10 @@ func (self *SOpenStackProviderFactory) ValidateUpdateCloudaccountCredential(ctx
func (self *SOpenStackProviderFactory) GetProvider(providerId, providerName, url, account, password string) (cloudprovider.ICloudProvider, error) {
accountInfo := strings.Split(account, "/")
username, project := accountInfo[0], ""
if len(accountInfo) > 1 {
project = accountInfo[1]
if len(accountInfo) < 2 {
return nil, fmt.Errorf("Missing username or project name %s", account)
}
project, username := accountInfo[0], accountInfo[1]
client, err := openstack.NewOpenStackClient(providerId, providerName, url, username, password, project)
if err != nil {
return nil, err