Merge pull request #5506 from mohangk/fix_elb_register_new_instance

Fix exception being thrown for new instance registration with ELB
This commit is contained in:
jctanner 2014-01-27 12:19:44 -08:00
commit b8d3c0f865

View file

@ -202,7 +202,7 @@ class ElbManager:
if instance_state.state == awaited_state: if instance_state.state == awaited_state:
# Check the current state agains the initial state, and only set # Check the current state agains the initial state, and only set
# changed if they are different. # 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 self.changed = True
break break
elif self._is_instance_state_pending(instance_state): elif self._is_instance_state_pending(instance_state):