diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-06 04:59:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-06 04:59:51 +0000 |
| commit | c4cb51f5a8155ae3ac81a6a42a5b0340bc331eea (patch) | |
| tree | c3abc16f7ed49af5261b7cbbf06c228972f472da /openstackclient/api/image_v2.py | |
| parent | fb2a5492df5a65a3670df9485befb4bc2cae24a2 (diff) | |
| parent | 59727ba2f9bea133a1a7cf6ebe772d442568f312 (diff) | |
| download | python-openstackclient-c4cb51f5a8155ae3ac81a6a42a5b0340bc331eea.tar.gz | |
Merge "Don't hack the image url"
Diffstat (limited to 'openstackclient/api/image_v2.py')
| -rw-r--r-- | openstackclient/api/image_v2.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/openstackclient/api/image_v2.py b/openstackclient/api/image_v2.py index 37c2ed83..d8bb2801 100644 --- a/openstackclient/api/image_v2.py +++ b/openstackclient/api/image_v2.py @@ -19,11 +19,12 @@ from openstackclient.api import image_v1 class APIv2(image_v1.APIv1): """Image v2 API""" - def __init__(self, endpoint=None, **kwargs): - super(APIv2, self).__init__(endpoint=endpoint, **kwargs) + _endpoint_suffix = 'v2' + def _munge_url(self): # Hack this until discovery is up, and ignore parent endpoint setting - self.endpoint = '/'.join([endpoint.rstrip('/'), 'v2']) + if 'v2' not in self.endpoint.split('/')[-1]: + self.endpoint = '/'.join([self.endpoint, 'v2']) def image_list( self, |