openstack/shade
Code Issues Proposed changes

Merge "Clarify some variable names in glance discovery"

Browse Source
This commit is contained in:
Jenkins 2017-04-20 17:13:08 +00:00 committed by Gerrit Code Review
commit b32f082f43
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
shade/openstackcloud.py
View File

@ -470,17 +470,18 @@ class OpenStackCloud(_normalize.Normalizer):
" the catalog is already versioned. {e}".format(e=str(e)))
image_url = image_client.get_endpoint()
service_url = image_client.get_endpoint()
parsed_image_url = urllib.parse.urlparse(image_url)
parsed_service_url = urllib.parse.urlparse(service_url)
# Sometimes version discovery documents have broken endpoints, but
# the catalog has good ones (what?)
catalog_endpoint = urllib.parse.urlparse(image_client.get_endpoint())
discovered_endpoint = urllib.parse.urlparse(image_url)
image_url = urllib.parse.ParseResult(
parsed_service_url.scheme,
parsed_image_url.netloc,
parsed_image_url.path,
parsed_image_url.params,
parsed_image_url.query,
parsed_image_url.fragment).geturl()
return urllib.parse.ParseResult(
catalog_endpoint.scheme,
discovered_endpoint.netloc,
discovered_endpoint.path,
discovered_endpoint.params,
discovered_endpoint.query,
discovered_endpoint.fragment).geturl()
return image_url
@property