diff options
| -rw-r--r-- | openstackclient/image/client.py | 4 | ||||
| -rw-r--r-- | openstackclient/shell.py | 2 | ||||
| -rw-r--r-- | 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 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' diff --git a/tests/test_shell.py b/tests/test_shell.py index 6b9b0760..c33068d8 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" |