cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ec2_ami: Properly delete snapshots (#39606)

Browse source
This commit is contained in:
Sloane Hertel 2018-05-03 07:48:29 -04:00 committed by Ryan Brown
parent afdc2364f2
commit 910bc892c6
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/modules/cloud/amazon/ec2_ami.py
View file

@ -496,7 +496,7 @@ def deregister_image(module, connection):
snapshots = [] snapshots = []
if 'BlockDeviceMappings' in image: if 'BlockDeviceMappings' in image:
for mapping in image.get('BlockDeviceMappings'): for mapping in image.get('BlockDeviceMappings'):
snapshot_id = mapping.get('SnapshotId') snapshot_id = mapping.get('Ebs', {}).get('SnapshotId')
if snapshot_id is not None: if snapshot_id is not None:
snapshots.append(snapshot_id) snapshots.append(snapshot_id)

1
test/integration/targets/ec2_ami/tasks/main.yml
View file

@ -158,6 +158,7 @@
that: that:
- "result.changed" - "result.changed"
- "'image_id' not in result" - "'image_id' not in result"
- "result.snapshots_deleted"
# ============================================================ # ============================================================