summaryrefslogtreecommitdiff
path: root/openstackclient/identity/v2_0
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2014-10-17 23:43:38 -0500
committerDean Troyer <dtroyer@gmail.com>2014-10-18 00:01:52 -0500
commit2166d7d3afbbdc1659e4cffdb7bcd890cd00ec19 (patch)
tree63f1596a4eab44fa41ac54d4692dd3ba7f4efa93 /openstackclient/identity/v2_0
parent0de67016c7daa1712b568cb2e49728fac3eb57ad (diff)
downloadpython-openstackclient-2166d7d3afbbdc1659e4cffdb7bcd890cd00ec19.tar.gz
Remove ClientManager._service_catalog
Anything that needs a service catalog can get it directly from auth_ref.service_catalog, no need to carry the extra attribute. ClientManager.get_endpoint_for_service_type() reamins the proper method to get an endpoint for clients that still need one directly. Change-Id: I809091c9c71d08f29606d7fd8b500898ff2cb8ae
Diffstat (limited to 'openstackclient/identity/v2_0')
-rw-r--r--openstackclient/identity/v2_0/service.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/openstackclient/identity/v2_0/service.py b/openstackclient/identity/v2_0/service.py
index 458dce7c..e8848dde 100644
--- a/openstackclient/identity/v2_0/service.py
+++ b/openstackclient/identity/v2_0/service.py
@@ -141,9 +141,10 @@ class ShowService(show.ShowOne):
def take_action(self, parsed_args):
self.log.debug('take_action(%s)', parsed_args)
identity_client = self.app.client_manager.identity
+ auth_ref = self.app.client_manager.auth_ref
if parsed_args.catalog:
- endpoints = identity_client.service_catalog.get_endpoints(
+ endpoints = auth_ref.service_catalog.get_endpoints(
service_type=parsed_args.service)
for (service, service_endpoints) in six.iteritems(endpoints):
if service_endpoints: