Merge pull request #42 from BabisK/master

OpenStack provider uses domain_name or domain_id
hashicorp · Jul 17, 2018 · fc7e9a8 · fc7e9a8
2 parents 09fcce7 + 02e1d0a
commit fc7e9a8
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/provider/os/os_discover.go b/provider/os/os_discover.go
@@ -128,16 +128,16 @@ func newClient(args map[string]string, l *log.Logger) (*gophercloud.ServiceClien
 	}
 	projectID := argsOrEnv(args, "project_id", "OS_PROJECT_ID")
 	insecure := argsOrEnv(args, "insecure", "OS_INSECURE")
+	domain_id := argsOrEnv(args, "domain_id", "OS_DOMAIN_ID")
+	domain_name := argsOrEnv(args, "domain_name", "OS_DOMAIN_NAME")
 
 	if url == "" {
 		return nil, fmt.Errorf("discover-os: Auth url must be provided")
 	}
 
 	ao := gophercloud.AuthOptions{
-		// "domain_id": OS_DOMAIN_ID
-		DomainID: "",
-		// "domain_name": OS_DOMAIN_NAME
-		DomainName:       "",
+		DomainID:         domain_id,
+		DomainName:       domain_name,
 		IdentityEndpoint: url,
 		Username:         username,
 		Password:         password,