valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Always remove trailing "v2" from Glance endpoint

Browse Source
This commit is contained in:
Florian Ermisch 2015-08-14 22:56:59 +02:00
parent 1a90fb7465
commit ac8b49174b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/glance.py
View File

@ -127,7 +127,9 @@ def _auth(profile=None, api_version=2, **connection_args):
region = get('region')
ks_endpoint = get('endpoint', 'http://127.0.0.1:9292/')
g_endpoint_url = __salt__['keystone.endpoint_get']('glance')
g_endpoint_url = g_endpoint_url['internalurl'].strip('v'+str(api_version))
# The trailing 'v2' causes URLs like thise one:
# http://127.0.0.1:9292/v2/v1/images
g_endpoint_url = g_endpoint_url['internalurl'].strip('v2')
if admin_token and api_version != 1 and not password:
# If we had a password we could just