ec2_ami: Properly delete snapshots (#39606)

2018-05-03 07:48:29 -04:00 · 2018-05-03 07:48:29 -04:00 · 910bc892c6
commit 910bc892c6
parent afdc2364f2
2 changed files with 2 additions and 1 deletions
--- a/lib/ansible/modules/cloud/amazon/ec2_ami.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_ami.py
@ -496,7 +496,7 @@ def deregister_image(module, connection):
    snapshots = []
    if 'BlockDeviceMappings' in image:
        for mapping in image.get('BlockDeviceMappings'):
-            snapshot_id = mapping.get('SnapshotId')
+            snapshot_id = mapping.get('Ebs', {}).get('SnapshotId')
            if snapshot_id is not None:
                snapshots.append(snapshot_id)

--- a/test/integration/targets/ec2_ami/tasks/main.yml
+++ b/test/integration/targets/ec2_ami/tasks/main.yml
@ -158,6 +158,7 @@
        that:
          - "result.changed"
          - "'image_id' not in result"
+          - "result.snapshots_deleted"

    # ============================================================