Merge pull request #18038 from slaws/os-domain-config

Auto commit by PR queue bot
kubernetes · Dec 2, 2015 · 71f2d5e · 71f2d5e · k8s-teamcity-mesosphere · Dec 2, 2015
2 parents 494f47b + 3eae589
commit 71f2d5e
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/pkg/cloudprovider/providers/openstack/openstack.go b/pkg/cloudprovider/providers/openstack/openstack.go
@@ -134,6 +134,8 @@ func (cfg Config) toAuthOptions() gophercloud.AuthOptions {
 		APIKey:           cfg.Global.ApiKey,
 		TenantID:         cfg.Global.TenantId,
 		TenantName:       cfg.Global.TenantName,
+		DomainID:         cfg.Global.DomainId,
+		DomainName:       cfg.Global.DomainName,
 
 		// Persistent service, so we need to be able to renew tokens.
 		AllowReauth: true,