summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2013-02-18 12:58:06 -0600
committerJosh Kearney <josh@jk0.org>2013-02-19 09:19:52 -0600
commit237f0dd612c426abdc35b9f21c4cca040e3f4264 (patch)
tree281f496df4ed9746fb579201faa2205f25aff576 /openstackclient
parent79001ce88a7c0a2197cad32ae84565822ad9b40e (diff)
downloadpython-openstackclient-237f0dd612c426abdc35b9f21c4cca040e3f4264.tar.gz
Correct the version mapping to image service.
This was preventing image support from being activated. Change-Id: I1b7ab9174b90c55423b244ca63402d33b4411a49
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/image/client.py4
-rw-r--r--openstackclient/shell.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/openstackclient/image/client.py b/openstackclient/image/client.py
index 23e9a3e9..8a63da9c 100644
--- a/openstackclient/image/client.py
+++ b/openstackclient/image/client.py
@@ -22,8 +22,8 @@ LOG = logging.getLogger(__name__)
API_NAME = "image"
API_VERSIONS = {
- # FIXME(jk0): Temporary 1.0 -> 2 mapping.
- "1.0": "glanceclient.v2.client.Client"
+ "1.0": "glanceclient.v2.client.Client",
+ "2": "glanceclient.v2.client.Client"
}
diff --git a/openstackclient/shell.py b/openstackclient/shell.py
index ffa0245a..29f9f70a 100644
--- a/openstackclient/shell.py
+++ b/openstackclient/shell.py
@@ -35,7 +35,7 @@ KEYRING_SERVICE = 'openstack'
DEFAULT_COMPUTE_API_VERSION = '2'
DEFAULT_IDENTITY_API_VERSION = '2.0'
-DEFAULT_IMAGE_API_VERSION = '1.0'
+DEFAULT_IMAGE_API_VERSION = '2'
DEFAULT_VOLUME_API_VERSION = '1'