lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-06-05 19:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: client auth needs project domain info

Browse Source
This commit is contained in:
Qiu Jian
2019-05-30 19:07:45 +08:00
parent 42861cd43f
commit 8c799e3a5e
13 changed files with 100 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/util/openstack/openstack.go
View File

@@ -44,6 +44,7 @@ type SOpenStackClient struct {
username string
password string
project string
projectDomain string
endpointType string
domainName string
client *mcclient.Client
@@ -53,17 +54,18 @@ type SOpenStackClient struct {
Debug bool
}
func NewOpenStackClient(providerID string, providerName string, authURL string, username string, password string, project string, endpointType string, domainName string, isDebug bool) (*SOpenStackClient, error) {
func NewOpenStackClient(providerID string, providerName string, authURL string, username string, password string, project string, endpointType string, domainName string, projectDomainName string, isDebug bool) (*SOpenStackClient, error) {
cli := &SOpenStackClient{
providerID: providerID,
providerName: providerName,
authURL: strings.TrimRight(authURL, "/"),
username: username,
password: password,
project: project,
endpointType: endpointType,
domainName: domainName,
Debug: isDebug,
providerID: providerID,
providerName: providerName,
authURL: strings.TrimRight(authURL, "/"),
username: username,
password: password,
project: project,
projectDomain: projectDomainName,
endpointType: endpointType,
domainName: domainName,
Debug: isDebug,
}
return cli, cli.fetchRegions()
}
@@ -192,7 +194,7 @@ func (cli *SOpenStackClient) getVersion(region string, service string) (string,
func (cli *SOpenStackClient) connect() error {
cli.client = mcclient.NewClient(cli.authURL, 5, cli.Debug, false, "", "")
tokenCredential, err := cli.client.Authenticate(cli.username, cli.password, cli.domainName, cli.project)
tokenCredential, err := cli.client.Authenticate(cli.username, cli.password, cli.domainName, cli.project, cli.projectDomain)
if err != nil {
return err
}