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.6.0 -> master

Browse Source 
* commit 'f61d9df75c179adb2a58587edc911b25e1263e94':
  修复openstack项目及用户名顺序颠倒问题
This commit is contained in:
邱剑
2019-01-19 13:21:20 +08:00
parent a6a11ccb5e f61d9df75c
commit 517b5d5630
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