cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #6747 from ciupicri/cloud-bugfix

Browse source 
Bugfix for gc_storage and s3
This commit is contained in:
Michael DeHaan 2014-03-28 18:48:14 -04:00
commit 6c6523aa1b
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
library/cloud/gc_storage
View file

@ -152,11 +152,12 @@ def key_check(module, gs, bucket, obj):
def keysum(module, gs, bucket, obj): def keysum(module, gs, bucket, obj):
bucket = gs.lookup(bucket) bucket = gs.lookup(bucket)
key_check = bucket.get_key(obj) key_check = bucket.get_key(obj)
if key_check: if not key_check:
md5_remote = key_check.etag[1:-1] return None
etag_multipart = '-' in md5_remote # Check for multipart, etag is not md5 md5_remote = key_check.etag[1:-1]
if etag_multipart is True: etag_multipart = '-' in md5_remote # Check for multipart, etag is not md5
module.fail_json(msg="Files uploaded with multipart of gs are not supported with checksum, unable to compute checksum.") if etag_multipart is True:
module.fail_json(msg="Files uploaded with multipart of gs are not supported with checksum, unable to compute checksum.")
return md5_remote return md5_remote
def bucket_check(module, gs, bucket): def bucket_check(module, gs, bucket):

11
library/cloud/s3
View file

@ -145,11 +145,12 @@ def key_check(module, s3, bucket, obj):
def keysum(module, s3, bucket, obj): def keysum(module, s3, bucket, obj):
bucket = s3.lookup(bucket) bucket = s3.lookup(bucket)
key_check = bucket.get_key(obj) key_check = bucket.get_key(obj)
if key_check: if not key_check:
md5_remote = key_check.etag[1:-1] return None
etag_multipart = '-' in md5_remote # Check for multipart, etag is not md5 md5_remote = key_check.etag[1:-1]
if etag_multipart is True: etag_multipart = '-' in md5_remote # Check for multipart, etag is not md5
module.fail_json(msg="Files uploaded with multipart of s3 are not supported with checksum, unable to compute checksum.") if etag_multipart is True:
module.fail_json(msg="Files uploaded with multipart of s3 are not supported with checksum, unable to compute checksum.")
return md5_remote return md5_remote
def bucket_check(module, s3, bucket): def bucket_check(module, s3, bucket):