diff options
author | Jenkins <jenkins@review.openstack.org> | 2012-12-17 23:52:40 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2012-12-17 23:52:40 +0000 |
commit | eaffdf4cc80df9751e63c4992d4ba86fe24edb6b (patch) | |
tree | 579950701d91ed961ade10f39d2757c734e3f149 /keystoneclient/v2_0 | |
parent | 581264757e5ac8c5313acc35e5dc94247c7a80ff (diff) | |
parent | 15f67872eeef59a13396505d4700317347e14b40 (diff) | |
download | python-keystoneclient-eaffdf4cc80df9751e63c4992d4ba86fe24edb6b.tar.gz |
Merge "Prevent an uncaught exception from being rasied."
Diffstat (limited to 'keystoneclient/v2_0')
-rw-r--r-- | keystoneclient/v2_0/client.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystoneclient/v2_0/client.py b/keystoneclient/v2_0/client.py index 7ffaba6..e98f7a2 100644 --- a/keystoneclient/v2_0/client.py +++ b/keystoneclient/v2_0/client.py @@ -149,7 +149,7 @@ class Client(client.HTTPClient): # to determine what to do. Otherwise, load up the service catalog self.auth_token = self.auth_ref.auth_token if self.auth_ref.scoped: - if self.management_url is None: + if self.management_url is None and self.auth_ref.management_url: self.management_url = self.auth_ref.management_url[0] self.tenant_name = self.auth_ref.tenant_name self.tenant_id = self.auth_ref.tenant_id |