summaryrefslogtreecommitdiff
path: root/openstackclient/object
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/object
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/object')
-rw-r--r--openstackclient/object/client.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/openstackclient/object/client.py b/openstackclient/object/client.py
index 1ac905c3..beb7c04f 100644
--- a/openstackclient/object/client.py
+++ b/openstackclient/object/client.py
@@ -33,10 +33,10 @@ API_VERSIONS = {
def make_client(instance):
"""Returns an object-store API client."""
- if instance._url:
- endpoint = instance._url
- else:
- endpoint = instance.get_endpoint_for_service_type("object-store")
+ endpoint = instance.get_endpoint_for_service_type(
+ 'object-store',
+ region_name=instance._region_name,
+ )
client = object_store_v1.APIv1(
session=instance.session,