From b4911a47d1589693791bdf40ed979e239d69d6d2 Mon Sep 17 00:00:00 2001 From: Juho-Mikko Pellinen Date: Tue, 7 Jul 2015 16:31:47 +0300 Subject: [PATCH] Change the default flag value to None to prevent AWS complaining: "Instance creation failed => InvalidBlockDeviceMapping: the encrypted flag cannot be specified since device /dev/sda1 has a snapshot specified." --- cloud/amazon/ec2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud/amazon/ec2.py b/cloud/amazon/ec2.py index b79395fb3a1..840cf4fed1f 100644 --- a/cloud/amazon/ec2.py +++ b/cloud/amazon/ec2.py @@ -701,7 +701,7 @@ def create_block_device(module, ec2, volume): volume_type=volume.get('device_type'), delete_on_termination=volume.get('delete_on_termination', False), iops=volume.get('iops'), - encrypted=volume.get('encrypted', False)) + encrypted=volume.get('encrypted', None)) def boto_supports_param_in_spot_request(ec2, param): """