Skip to content
This repository was archived by the owner on Aug 1, 2023. It is now read-only.

Fix AuthOptionsFromEnv for mitaka #619

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix AuthOptionsFromEnv for mitaka #619

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions openstack/auth_env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var (

// AuthOptionsFromEnv fills out an AuthOptions structure from the environment
// variables: OS_AUTH_URL, OS_USERNAME, OS_USERID, OS_PASSWORD, OS_TENANT_ID,
// OS_TENANT_NAME, OS_DOMAIN_ID, OS_DOMAIN_NAME, OS_TOKEN. It checks that
// OS_TENANT_NAME, OS_USER_DOMAIN_ID, OS_USER_DOMAIN_NAME, OS_TOKEN. It checks that
// (1) OS_AUTH_URL is set, (2) OS_USERNAME, OS_USERID, or OS_TOKEN is set,
// (3) OS_PASSWORD or OS_TOKEN is set.
func AuthOptionsFromEnv() (gophercloud.AuthOptions, error) {
Expand All @@ -29,8 +29,8 @@ func AuthOptionsFromEnv() (gophercloud.AuthOptions, error) {
password := os.Getenv("OS_PASSWORD")
tenantID := os.Getenv("OS_TENANT_ID")
tenantName := os.Getenv("OS_TENANT_NAME")
domainID := os.Getenv("OS_DOMAIN_ID")
domainName := os.Getenv("OS_DOMAIN_NAME")
domainID := os.Getenv("OS_USER_DOMAIN_ID")
domainName := os.Getenv("OS_USER_DOMAIN_NAME")
tokenID := os.Getenv("OS_TOKEN")

if authURL == "" {
Expand Down