From 0b950510396f29f73c97c9a7b548b759d73c89e5 Mon Sep 17 00:00:00 2001 From: Shawn Siefkas Date: Tue, 2 Aug 2016 15:37:01 -0500 Subject: [PATCH] Fix #2526 (#2527) Fail on unhandled exception in ec2_asg rather than raise --- lib/ansible/modules/cloud/amazon/ec2_asg.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/ansible/modules/cloud/amazon/ec2_asg.py b/lib/ansible/modules/cloud/amazon/ec2_asg.py index e9d3e4cf1e..2bbbb01b65 100644 --- a/lib/ansible/modules/cloud/amazon/ec2_asg.py +++ b/lib/ansible/modules/cloud/amazon/ec2_asg.py @@ -336,8 +336,12 @@ def elb_healthy(asg_connection, elb_connection, module, group_name): # but has not yet show up in the ELB try: lb_instances = elb_connection.describe_instance_health(lb, instances=instances) - except boto.exception.InvalidInstance: - pass + except boto.exception.BotoServerError as e: + if e.error_code == 'InvalidInstance': + return None + + module.fail_json(msg=str(e)) + for i in lb_instances: if i.state == "InService": healthy_instances.append(i.instance_id)