Merge pull request #5506 from mohangk/fix_elb_register_new_instance

Fix exception being thrown for new instance registration with ELB
11 years ago · 7d133950bd
parent 1568616117 ec78be8494
commit 7d133950bd
1 changed files with 1 additions and 1 deletions
--- a/cloud/ec2_elb
+++ b/cloud/ec2_elb
@ -202,7 +202,7 @@ class ElbManager:
            if instance_state.state == awaited_state:
                # Check the current state agains the initial state, and only set
                # changed if they are different.
-                if instance_state.state != initial_state.state:
+                if (initial_state is None) or (instance_state.state != initial_state.state):
                    self.changed = True
                break
            elif self._is_instance_state_pending(instance_state):