Merge pull request #870 from tpounds/fix-issue-869

Instance deregistration should try all associated ELBs. Fixes #869
9 years ago · e7203514ea
parent 85e9ccd17b 07d562c58a
commit e7203514ea
1 changed files with 3 additions and 3 deletions
--- 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])