Merge pull request #1680 from Pallokala/topic_ec2_volume_default_encryption_flag_value_to_None

Change the default flag value to None to prevent AWS complaining: "In…
9 years ago · 5ec040a1d2
parent e3c774be6f b4911a47d1
commit 5ec040a1d2
1 changed files with 1 additions and 1 deletions
--- 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):
    """