From 498ddf95c67f15787f5083bf7aa9ea58668537da Mon Sep 17 00:00:00 2001
From: Steve Martinelli <stevemar@ca.ibm.com>
Date: Thu, 17 Jul 2014 19:17:07 -0400
Subject: [PATCH] Change object API_NAME to 'object_store'
Previously the API_NAME was 'object-store' which caused all sorts
of failures when running swift commands
Change-Id: I448ca10f7d173024313722246e63cf23fd71117c
Closes-Bug: #1343658
---
openstackclient/object/client.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/openstackclient/object/client.py b/openstackclient/object/client.py
index 4fe59794aa..006d54c517 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,