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

Fix ec2_snapshot_facts traceback if a snapshot has been deleted (#32217)

Browse source
This commit is contained in:
Sloane Hertel 2017-11-15 10:56:49 -05:00 committed by Ryan Brown
parent 53ade280a3
commit cabd7f078b
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/modules/cloud/amazon/ec2_snapshot_facts.py
View file

@ -193,7 +193,12 @@ def list_ec2_snapshots(connection, module):
try:
snapshots = connection.describe_snapshots(SnapshotIds=snapshot_ids, OwnerIds=owner_ids, RestorableByUserIds=restorable_by_user_ids, Filters=filters)
except ClientError as e:
module.fail_json(msg=e.message)
if e.response['Error']['Code'] == "InvalidSnapshot.NotFound":
if len(snapshot_ids) > 1:
module.warn("Some of your snapshots may exist, but %s" % str(e))
snapshots = {'Snapshots': []}
else:
module.fail_json(msg="Failed to describe snapshots: %s" % str(e))
# Turn the boto3 result in to ansible_friendly_snaked_names
snaked_snapshots = []