summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-19 09:38:04 +0000
committerGerrit Code Review <review@openstack.org>2017-05-19 09:38:04 +0000
commit843b4754f6d83910b5463421659ccb3e3feaf75d (patch)
treedc7fb14012ed0162e68af5223b37dfe35c427095
parent99f7c8c9ad26539473f65f30547ba548c02ab4fe (diff)
parent85c1415c76a6fca5a9c6a7e26e7abe121a669310 (diff)
Merge "Always pass the public endpoint to the client" into stable/newton10.0.4
-rw-r--r--openstack_dashboard/api/glance.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/openstack_dashboard/api/glance.py b/openstack_dashboard/api/glance.py
index 97bb54f..d151446 100644
--- a/openstack_dashboard/api/glance.py
+++ b/openstack_dashboard/api/glance.py
@@ -388,7 +388,7 @@ def get_image_upload_mode():
388class ExternallyUploadedImage(Image): 388class ExternallyUploadedImage(Image):
389 def __init__(self, apiresource, request): 389 def __init__(self, apiresource, request):
390 super(ExternallyUploadedImage, self).__init__(apiresource) 390 super(ExternallyUploadedImage, self).__init__(apiresource)
391 image_endpoint = base.url_for(request, 'image') 391 image_endpoint = base.url_for(request, 'image', 'publicURL')
392 if VERSIONS.active >= 2: 392 if VERSIONS.active >= 2:
393 upload_template = "%s/v2/images/%s/file" 393 upload_template = "%s/v2/images/%s/file"
394 else: 394 else: