From 7ac2716462c01e895af98321d04867869bff2984 Mon Sep 17 00:00:00 2001 From: jiasir Date: Wed, 16 Nov 2016 19:47:23 +0800 Subject: [PATCH] Fix AuthOptionsFromEnv for mitaka --- openstack/auth_env.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openstack/auth_env.go b/openstack/auth_env.go index 2d226d60..f7288156 100644 --- a/openstack/auth_env.go +++ b/openstack/auth_env.go @@ -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) { @@ -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 == "" {