From a7d1a704428ea44d01e3713122621e6f140fac6c Mon Sep 17 00:00:00 2001
From: Nathan LeClaire <nathan.leclaire@gmail.com>
Date: Tue, 3 Mar 2015 14:47:06 -0800
Subject: [PATCH] Fix IP address not being set correctly due to race

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
---
 drivers/amazonec2/amazonec2.go | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/amazonec2/amazonec2.go b/drivers/amazonec2/amazonec2.go
index 2913cf13ad..c720855d20 100644
--- a/drivers/amazonec2/amazonec2.go
+++ b/drivers/amazonec2/amazonec2.go
@@ -316,8 +316,8 @@ func (d *Driver) Create() error {
 			return err
 		}
 		if ip != "" {
-
-			d.IPAddress = instance.IpAddress
+			d.IPAddress = ip
+			log.Debugf("Got the IP Address, it's %q", d.IPAddress)
 			break
 		}
 		time.Sleep(5 * time.Second)
@@ -565,10 +565,6 @@ func (d *Driver) waitForInstance() error {
 		time.Sleep(1 * time.Second)
 	}
 
-	if err := d.updateDriver(); err != nil {
-		return err
-	}
-
 	return nil
 }