From 237f0dd612c426abdc35b9f21c4cca040e3f4264 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh@jk0.org>
Date: Mon, 18 Feb 2013 12:58:06 -0600
Subject: [PATCH] Correct the version mapping to image service.

This was preventing image support from being activated.

Change-Id: I1b7ab9174b90c55423b244ca63402d33b4411a49
---
 openstackclient/image/client.py | 4 ++--
 openstackclient/shell.py        | 2 +-
 tests/test_shell.py             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openstackclient/image/client.py b/openstackclient/image/client.py
index 23e9a3e9f..8a63da9c7 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 ffa0245a7..29f9f70a7 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'
 
 
diff --git a/tests/test_shell.py b/tests/test_shell.py
index 6b9b07609..c33068d86 100644
--- a/tests/test_shell.py
+++ b/tests/test_shell.py
@@ -36,7 +36,7 @@ DEFAULT_VOLUME_API_VERSION = "1"
 
 LIB_COMPUTE_API_VERSION = "2"
 LIB_IDENTITY_API_VERSION = "2.0"
-LIB_IMAGE_API_VERSION = "1.0"
+LIB_IMAGE_API_VERSION = "2"
 LIB_VOLUME_API_VERSION = "1"