openstack/nova
Code Issues Proposed changes

Merge "Remove v1 check in Cinder client version lookup"

Browse Source
This commit is contained in:
Zuul 2018-11-21 05:35:43 +00:00 committed by Gerrit Code Review
commit 7217e38baf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova/volume/cinder.py
View File

@ -126,11 +126,11 @@ def _get_server_version(context, url):
# NOTE(andreykurilin): endpoint URL has at least 2 formats: # NOTE(andreykurilin): endpoint URL has at least 2 formats:
# 1. The classic (legacy) endpoint: # 1. The classic (legacy) endpoint:
# http://{host}:{optional_port}/v{1 or 2 or 3}/{project-id} # http://{host}:{optional_port}/v{2 or 3}/{project-id}
# http://{host}:{optional_port}/v{1 or 2 or 3} # http://{host}:{optional_port}/v{2 or 3}
# 3. Under wsgi: # 3. Under wsgi:
# http://{host}:{optional_port}/volume/v{1 or 2 or 3} # http://{host}:{optional_port}/volume/v{2 or 3}
for ver in ['v1', 'v2', 'v3']: for ver in ['v2', 'v3']:
if u.path.endswith(ver) or "/{0}/".format(ver) in u.path: if u.path.endswith(ver) or "/{0}/".format(ver) in u.path:
path = u.path[:u.path.rfind(ver)] path = u.path[:u.path.rfind(ver)]
version_url = '%s://%s%s' % (u.scheme, u.netloc, path) version_url = '%s://%s%s' % (u.scheme, u.netloc, path)