From 07d562c58a85dec379da5167c98fcc8fba367a87 Mon Sep 17 00:00:00 2001 From: Trevor Pounds Date: Fri, 27 Feb 2015 01:05:47 -0800 Subject: [PATCH] Instance deregistration should try all associated ELBs. Fixes #869 --- cloud/amazon/ec2_elb.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cloud/amazon/ec2_elb.py b/cloud/amazon/ec2_elb.py index 11abd827b2b..5e858cc9c3d 100644 --- a/cloud/amazon/ec2_elb.py +++ b/cloud/amazon/ec2_elb.py @@ -130,9 +130,9 @@ class ElbManager: for lb in self.lbs: initial_state = self._get_instance_health(lb) if initial_state is None: - # The instance isn't registered with this ELB so just - # return unchanged - return + # Instance isn't registered with this load + # balancer. Ignore it and try the next one. + continue lb.deregister_instances([self.instance_id])