Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions auth_aksk_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ type AKSKAuthOptions struct {
Domain string
DomainID string

// cloud service domain for BSS
BssDomain string
BssDomainID string

AccessKey string //Access Key
SecretKey string //Secret key

Expand Down
11 changes: 10 additions & 1 deletion openstack/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,17 @@ func v3AKSKAuth(client *golangsdk.ProviderClient, endpoint string, options golan
}
}

if options.BssDomainID == "" && options.BssDomain != "" {
id, err := getDomainID(options.BssDomain, v3Client)
if err != nil {
options.BssDomainID = ""
} else {
options.BssDomainID = id
}
}

client.ProjectID = options.ProjectId
client.DomainID = options.DomainID
client.DomainID = options.BssDomainID
v3Client.ProjectID = options.ProjectId

var entries = make([]tokens3.CatalogEntry, 0, 1)
Expand Down