diff --git a/lib/ansible/modules/cloud/amazon/aws_s3.py b/lib/ansible/modules/cloud/amazon/aws_s3.py index 216d978d0ea..a61273ed218 100644 --- a/lib/ansible/modules/cloud/amazon/aws_s3.py +++ b/lib/ansible/modules/cloud/amazon/aws_s3.py @@ -396,11 +396,12 @@ def upload_s3file(module, s3, bucket, obj, src, expiry, metadata, encrypt, heade if module.check_mode: module.exit_json(msg="PUT operation skipped - running in check mode", changed=True) try: + extra = {} + if encrypt: + extra['ServerSideEncryption'] = 'AES256' if metadata: - extra = {'Metadata': dict(metadata)} - s3.upload_file(Filename=src, Bucket=bucket, Key=obj, ExtraArgs=extra) - else: - s3.upload_file(Filename=src, Bucket=bucket, Key=obj) + extra['Metadata'] = dict(metadata) + s3.upload_file(Filename=src, Bucket=bucket, Key=obj, ExtraArgs=extra) for acl in module.params.get('permission'): s3.put_object_acl(ACL=acl, Bucket=bucket, Key=obj) url = s3.generate_presigned_url(ClientMethod='put_object',