diff --git a/src/vmm_mad/remotes/ec2/ec2_driver.conf b/src/vmm_mad/remotes/ec2/ec2_driver.conf index 9dc4532fd8..0329b1d59a 100644 --- a/src/vmm_mad/remotes/ec2/ec2_driver.conf +++ b/src/vmm_mad/remotes/ec2/ec2_driver.conf @@ -1,4 +1,5 @@ proxy_uri: +state_wait_timeout_seconds: 300 regions: default: region_name: us-east-1 diff --git a/src/vmm_mad/remotes/ec2/ec2_driver.rb b/src/vmm_mad/remotes/ec2/ec2_driver.rb index 787ab41a2a..9c87c6a1a0 100755 --- a/src/vmm_mad/remotes/ec2/ec2_driver.rb +++ b/src/vmm_mad/remotes/ec2/ec2_driver.rb @@ -297,6 +297,11 @@ class EC2Driver if ec2_value(ec2_info, 'ELASTICIP') begin + start_time = Time.now + while instance.status == :pending + break if Time.now - start_time > @state_change_timeout + sleep 5 + end instance.associate_elastic_ip(ec2_value(ec2_info, 'ELASTICIP')) rescue => e STDERR.puts(e.message)