Skip to content

Commit 601fa16

Browse files
committed
Merge pull request ansible#1327 from bennojoy/issue_600
fixes issue ansible#600, where ec2 module returns instance state as running ev…
2 parents 4b44aa4 + 9d9d8de commit 601fa16

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

cloud/amazon/ec2.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,6 +1089,13 @@ def terminate_instances(module, ec2, instance_ids):
10891089
# waiting took too long
10901090
if wait_timeout < time.time() and num_terminated < len(terminated_instance_ids):
10911091
module.fail_json(msg = "wait for instance termination timeout on %s" % time.asctime())
1092+
#Lets get the current state of the instances after terminating - issue600
1093+
instance_dict_array = []
1094+
for res in ec2.get_all_instances(instance_ids=terminated_instance_ids,\
1095+
filters={'instance-state-name':'terminated'}):
1096+
for inst in res.instances:
1097+
instance_dict_array.append(get_instance_info(inst))
1098+
10921099

10931100
return (changed, instance_dict_array, terminated_instance_ids)
10941101

0 commit comments

Comments
 (0)