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

Fix #2526 (#2527)

Browse source 
Fail on unhandled exception in ec2_asg rather than raise
This commit is contained in:
Shawn Siefkas 2016-08-02 15:37:01 -05:00 committed by Matt Clay
parent 66f1f6d537
commit 0b95051039
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/cloud/amazon/ec2_asg.py
View file

@ -336,8 +336,12 @@ def elb_healthy(asg_connection, elb_connection, module, group_name):
# but has not yet show up in the ELB # but has not yet show up in the ELB
try: try:
lb_instances = elb_connection.describe_instance_health(lb, instances=instances) lb_instances = elb_connection.describe_instance_health(lb, instances=instances)
except boto.exception.InvalidInstance: except boto.exception.BotoServerError as e:
pass if e.error_code == 'InvalidInstance':
return None
module.fail_json(msg=str(e))
for i in lb_instances: for i in lb_instances:
if i.state == "InService": if i.state == "InService":
healthy_instances.append(i.instance_id) healthy_instances.append(i.instance_id)