Merge pull request #5506 from mohangk/fix_elb_register_new_instance

Fix exception being thrown for new instance registration with ELB

Merge pull request #5506 from mohangk/fix_elb_register_new_instance
Fix exception being thrown for new instance registration with ELB
b8d3c0f8 · jctanner · ff6b44e3 · 0f95961e · b8d3c0f8
Commit b8d3c0f8 authored Jan 27, 2014 by jctanner
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

library/cloud/ec2_elb
+1 -1

No files found.
--- a/library/cloud/ec2_elb
+++ b/library/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):