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

Unpack AWS reservations while waiting to terminate (#4012)

Browse source 
Previously calculation of the number of instances that have been
terminated assumed all instances were in the first reservation returned
by AWS.  If this is not the case the calculated number of instances
terminated never reaches the number of instances and the module always
times out. By unpacking the instances we get an accurate number and the
module correctly exits.
This commit is contained in:
Christopher Kotfila 2016-09-13 15:07:14 -04:00 committed by Matt Clay
parent 1a02005b8d
commit f916dae700
1 changed files with 1 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.py
View file

@ -1233,7 +1233,7 @@ def terminate_instances(module, ec2, instance_ids):
instance_ids=terminated_instance_ids, \ instance_ids=terminated_instance_ids, \
filters={'instance-state-name':'terminated'}) filters={'instance-state-name':'terminated'})
try: try:
num_terminated = len(response.pop().instances) num_terminated = sum([len(res.instances) for res in response])
except Exception as e: except Exception as e:
# got a bad response of some sort, possibly due to # got a bad response of some sort, possibly due to
# stale/cached data. Wait a second and then try again # stale/cached data. Wait a second and then try again