Merge pull request #531 from alexcern/fix/reauth_with_base_path

jrperritt · jrperritt · commit 89bdd4f58da2 · 2016-02-10T10:06:47.000-06:00
Support reauth on identity endpoints with a base path
diff --git a/openstack/client.go b/openstack/client.go
@@ -110,7 +110,7 @@ func v2auth(client *gophercloud.ProviderClient, endpoint string, options gopherc
 	if options.AllowReauth {
 		client.ReauthFunc = func() error {
 			client.TokenID = ""
-			return AuthenticateV2(client, options)
+			return v2auth(client, endpoint, options)
 		}
 	}
 	client.TokenID = token.ID
@@ -168,7 +168,7 @@ func v3auth(client *gophercloud.ProviderClient, endpoint string, options gopherc
 	if options.AllowReauth {
 		client.ReauthFunc = func() error {
 			client.TokenID = ""
-			return AuthenticateV3(client, options)
+			return v3auth(client, endpoint, options)
 		}
 	}
 	client.EndpointLocator = func(opts gophercloud.EndpointOpts) (string, error) {

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ func v2auth(client *gophercloud.ProviderClient, endpoint string, options gopherc`
`110`	`110`	`if options.AllowReauth {`
`111`	`111`	`client.ReauthFunc = func() error {`
`112`	`112`	`client.TokenID = ""`
`113`		`- return AuthenticateV2(client, options)`
	`113`	`+ return v2auth(client, endpoint, options)`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`	`client.TokenID = token.ID`
`@@ -168,7 +168,7 @@ func v3auth(client *gophercloud.ProviderClient, endpoint string, options gopherc`
`168`	`168`	`if options.AllowReauth {`
`169`	`169`	`client.ReauthFunc = func() error {`
`170`	`170`	`client.TokenID = ""`
`171`		`- return AuthenticateV3(client, options)`
	`171`	`+ return v3auth(client, endpoint, options)`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`	`client.EndpointLocator = func(opts gophercloud.EndpointOpts) (string, error) {`