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

fixing mime types in s3_sync module (#20059)

Browse source
This commit is contained in:
Robert Sax 2017-01-19 15:14:05 -05:00 committed by Ryan Brown
parent e8a94acffa
commit 9d26d8b605
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/modules/cloud/amazon/s3_sync.py
View file

@ -428,12 +428,11 @@ def upload_files(s3, bucket, filelist, params):
ret = [] ret = []
for entry in filelist: for entry in filelist:
args = { args = {
'ContentLength': entry['bytes'],
'ContentType': entry['mime_type'] 'ContentType': entry['mime_type']
} }
if params.get('permission'): if params.get('permission'):
args['ACL'] = params['permission'] args['ACL'] = params['permission']
s3.upload_file(entry['fullpath'], bucket, entry['s3_path'], ExtraArgs=None, Callback=None, Config=None) s3.upload_file(entry['fullpath'], bucket, entry['s3_path'], ExtraArgs=args, Callback=None, Config=None)
ret.append(entry) ret.append(entry)
return ret return ret