Permalink
Browse files

Merge pull request #6318 from jimi-c/issue_5305_ec2_elb_None_issue

Adding a wait loop to ec2_elb for the initial lb state when registering
  • Loading branch information...
2 parents 85bc14a + 7f1989d commit 5a235f9e9914179727523affd51b0c8cb38147c5 @jimi-c jimi-c committed Mar 6, 2014
Showing with 11 additions and 1 deletion.
  1. +11 −1 library/cloud/ec2_elb
View
@@ -157,7 +157,17 @@ class ElbManager:
to report the instance in-service"""
for lb in self.lbs:
if wait:
- initial_state = self._get_instance_health(lb)
+ tries = 1
+ while True:
+ initial_state = self._get_instance_health(lb)
+ if initial_state:
+ break
+ time.sleep(1)
+ tries += 1
+ # FIXME: this should be configurable, but since it didn't
+ # wait at all before this is at least better
+ if tries > 10:
+ self.module.fail_json(msg='failed to find the initial state of the load balancer')
if enable_availability_zone:
self._enable_availailability_zone(lb)

0 comments on commit 5a235f9

Please sign in to comment.