wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prevent ec2_remote_facts from failing when listing a terminated instance

Browse source
This commit is contained in:
wimnat 2015-11-03 01:03:31 +00:00 committed by Matt Clay
parent 3ef5be470f
commit 482f0a8d1c
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/extras/cloud/amazon/ec2_remote_facts.py
View file

@ -77,6 +77,12 @@ def get_instance_info(instance):
for interface in instance.interfaces: for interface in instance.interfaces:
interfaces.append({ 'id': interface.id, 'mac_address': interface.mac_address }.copy()) interfaces.append({ 'id': interface.id, 'mac_address': interface.mac_address }.copy())
# If an instance is terminated, sourceDestCheck is no longer returned
try:
source_dest_check = instance.sourceDestCheck
except AttributeError:
source_dest_check = None
instance_info = { 'id': instance.id, instance_info = { 'id': instance.id,
'kernel': instance.kernel, 'kernel': instance.kernel,
'instance_profile': instance.instance_profile, 'instance_profile': instance.instance_profile,
@ -90,7 +96,7 @@ def get_instance_info(instance):
'ramdisk': instance.ramdisk, 'ramdisk': instance.ramdisk,
'tags': instance.tags, 'tags': instance.tags,
'key_name': instance.key_name, 'key_name': instance.key_name,
'source_destination_check': instance.sourceDestCheck, 'source_destination_check': source_dest_check,
'image_id': instance.image_id, 'image_id': instance.image_id,
'groups': groups, 'groups': groups,
'interfaces': interfaces, 'interfaces': interfaces,