summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrant Knudson <bknudson@us.ibm.com>2015-07-24 10:11:57 -0500
committerBrant Knudson <bknudson@us.ibm.com>2015-07-24 11:04:04 -0500
commit66fd1eb7484f92a7d3daa468be8c47910ba79216 (patch)
treefafee75b7426168db1bc8f64e0399f7a660e7a37
parentf782ee853c49dda7f86055192a01c75269e26aff (diff)
downloadpython-keystoneclient-66fd1eb7484f92a7d3daa468be8c47910ba79216.tar.gz
Stop using deprecated AccessInfo.auth_url and management_url
The comments for the auth_url and management_url properties say that they're deprecated and to use the service catalog, but internal code was using the deprecated function. The code needs to be changed to use non-deprecated function. bp deprecations Change-Id: I6ada821fe305650d22e58a55192332f0f4986537
-rw-r--r--keystoneclient/httpclient.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/keystoneclient/httpclient.py b/keystoneclient/httpclient.py
index e1ee4c6..9c51f6d 100644
--- a/keystoneclient/httpclient.py
+++ b/keystoneclient/httpclient.py
@@ -248,8 +248,14 @@ class HTTPClient(baseclient.Client, base.BaseAuthPlugin):
self.project_id = self.auth_ref.project_id
self.project_name = self.auth_ref.project_name
self.project_domain_id = self.auth_ref.project_domain_id
- self.auth_url = self.auth_ref.auth_url[0]
- self._management_url = self.auth_ref.management_url[0]
+ auth_urls = self.auth_ref.service_catalog.get_urls(
+ service_type='identity', endpoint_type='public',
+ region_name=region_name)
+ self.auth_url = auth_urls[0]
+ management_urls = self.auth_ref.service_catalog.get_urls(
+ service_type='identity', endpoint_type='admin',
+ region_name=region_name)
+ self._management_url = management_urls[0]
self.auth_token_from_user = self.auth_ref.auth_token
self.trust_id = self.auth_ref.trust_id
if self.auth_ref.has_service_catalog() and not region_name: