Use non-absolute paths, to allow urljoin join them correctly
Change-Id: I530f7f43ae69e82fd0db68015165b86ba61e5ce2 Closes-Bug: #1503593
This commit is contained in:
parent
d1a894a31b
commit
b0a5b4a98c
@ -304,7 +304,7 @@ class Package(FileWrapperMixin):
|
||||
name,
|
||||
base_url=base_url,
|
||||
version=version,
|
||||
path='/apps/',
|
||||
path='apps/',
|
||||
extension='.zip')
|
||||
)
|
||||
|
||||
@ -415,7 +415,7 @@ def save_image_local(image_spec, base_url, dst):
|
||||
download_url = to_url(
|
||||
image_spec.get("Url", image_spec['Name']),
|
||||
base_url=base_url,
|
||||
path='/images/'
|
||||
path='images/'
|
||||
)
|
||||
|
||||
with open(dst, "wb") as image_file:
|
||||
@ -503,7 +503,7 @@ def ensure_images(glance_client, image_specs, base_url, local_path=None):
|
||||
download_url = to_url(
|
||||
image_spec.get("Url", image_spec['Name']),
|
||||
base_url=base_url,
|
||||
path='/images/',
|
||||
path='images/',
|
||||
)
|
||||
LOG.info("Instructing glance to download image {0}".format(
|
||||
image_spec['Name']))
|
||||
|
@ -627,7 +627,7 @@ def do_bundle_import(mc, args):
|
||||
_file = utils.to_url(
|
||||
filename,
|
||||
base_url=args.murano_repo_url,
|
||||
path='/bundles/',
|
||||
path='bundles/',
|
||||
extension='.bundle',
|
||||
)
|
||||
|
||||
@ -740,7 +740,7 @@ def do_bundle_save(mc, args):
|
||||
_file = utils.to_url(
|
||||
bundle,
|
||||
base_url=base_url,
|
||||
path='/bundles/',
|
||||
path='bundles/',
|
||||
extension='.bundle',
|
||||
)
|
||||
try:
|
||||
|
Loading…
Reference in New Issue
Block a user