openstack/shade
Code Issues Proposed changes

Pass md5 and sha256 to create_object sanely.

Browse Source 
The logic to skip md5/sha256 calculation was flawed, as it pulled the
wrong keys from the image_kwargs. The whole idea of pulling parameters
from the image create kwargs is too clevel though. Just go ahead and
pass the values as real python parameters.

Change-Id: I516b0143d6874bd31f5050fc6bee0dc8227dfcda
This commit is contained in:
Monty Taylor 2016-12-15 07:11:57 -06:00
parent 8c0ea00215
commit 916ba38123
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shade/openstackcloud.py
View File

@ -3183,6 +3183,7 @@ class OpenStackCloud(_normalize.Normalizer):
name, filename, container,
current_image=current_image,
wait=wait, timeout=timeout,
md5=md5, sha256=sha256,
meta=meta, **kwargs)
else:
# If a user used the v1 calling format, they will have
@ -3312,7 +3313,7 @@ class OpenStackCloud(_normalize.Normalizer):
def _upload_image_task(
self, name, filename, container, current_image,
wait, timeout, meta, **image_kwargs):
wait, timeout, meta, md5=None, sha256=None, **image_kwargs):
parameters = image_kwargs.pop('parameters', {})
image_kwargs.update(parameters)
@ -3325,8 +3326,7 @@ class OpenStackCloud(_normalize.Normalizer):
self.create_object(
container, name, filename,
md5=image_kwargs.get('md5', None),
sha256=image_kwargs.get('sha256', None))
md5=md5, sha256=sha256)
if not current_image:
current_image = self.get_image(name)
# TODO(mordred): Can we do something similar to what nodepool does