diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-07-24 03:55:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-07-24 03:55:49 +0000 |
| commit | 8c556e6943f37b1324894c5abe89b416b6e47e6f (patch) | |
| tree | 87a1d6f8fe4a8aa7cb9f787186da9b7b4c7a5cba /openstackclient/object | |
| parent | f3dbab4a6c90541257c10b4b9389455b3e6cec13 (diff) | |
| parent | 498ddf95c67f15787f5083bf7aa9ea58668537da (diff) | |
| download | python-openstackclient-8c556e6943f37b1324894c5abe89b416b6e47e6f.tar.gz | |
Merge "Change object API_NAME to 'object_store'"
Diffstat (limited to 'openstackclient/object')
| -rw-r--r-- | openstackclient/object/client.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/openstackclient/object/client.py b/openstackclient/object/client.py index 4fe59794..006d54c5 100644 --- a/openstackclient/object/client.py +++ b/openstackclient/object/client.py @@ -23,7 +23,7 @@ LOG = logging.getLogger(__name__) DEFAULT_OBJECT_API_VERSION = '1' API_VERSION_OPTION = 'os_object_api_version' -API_NAME = 'object-store' +API_NAME = 'object_store' API_VERSIONS = { '1': 'openstackclient.object.client.ObjectClientv1', } @@ -31,6 +31,7 @@ API_VERSIONS = { def make_client(instance): """Returns an object service client.""" + object_client = utils.get_client_class( API_NAME, instance._api_version[API_NAME], @@ -40,7 +41,7 @@ def make_client(instance): if instance._url: endpoint = instance._url else: - endpoint = instance.get_endpoint_for_service_type(API_NAME) + endpoint = instance.get_endpoint_for_service_type("object-store") client = object_client( endpoint=endpoint, token=instance._token, |