Allow encryption of volumes based off snapshots (#58983)

Since May 10, 2019 AWS have allowed encrypted volumes to be created from snapshots.  BOTO3 allows this, but the EC2 module does not.  This change removes the restriction.

https://aws.amazon.com/about-aws/whats-new/2019/05/launch-encrypted-ebs-backed-ec2-instances-from-unencrypted-amis-in-a-single-step/
pull/60257/head
Stuart Pittaway 5 years ago committed by Jill R
parent d5a02fb3c8
commit 2c90ddd44d

@ -800,8 +800,6 @@ def create_block_device(module, ec2, volume):
size = volume.get('volume_size', snapshot.volume_size) size = volume.get('volume_size', snapshot.volume_size)
if int(volume['iops']) > MAX_IOPS_TO_SIZE_RATIO * size: if int(volume['iops']) > MAX_IOPS_TO_SIZE_RATIO * size:
module.fail_json(msg='IOPS must be at most %d times greater than size' % MAX_IOPS_TO_SIZE_RATIO) module.fail_json(msg='IOPS must be at most %d times greater than size' % MAX_IOPS_TO_SIZE_RATIO)
if 'encrypted' in volume:
module.fail_json(msg='You can not set encryption when creating a volume from a snapshot')
if 'ephemeral' in volume: if 'ephemeral' in volume:
if 'snapshot' in volume: if 'snapshot' in volume:
module.fail_json(msg='Cannot set both ephemeral and snapshot') module.fail_json(msg='Cannot set both ephemeral and snapshot')

Loading…
Cancel
Save