Merge pull request #2129 from lokulin/master

Fixes #2128 Retry the AWS API when looking for a newly created instance

builder/amazon/common/step_run_source_instance.go

@@ -195,7 +195,16 @@ func (s *StepRunSourceInstance) Run(state multistep.StateBag) multistep.StepActi
 		instanceId = spotResp.SpotRequestResults[0].InstanceId
 	}
 
-	instanceResp, err := ec2conn.Instances([]string{instanceId}, nil)
+	var instanceResp, instanceErr = ec2conn.Instances([]string{instanceId}, nil)
+	for i := 0; i < 10; i++ {
+		if instanceErr == nil {
+			err = instanceErr
+			break
+		}
+		time.Sleep(time.Duration(3))
+		instanceResp, err = ec2conn.Instances([]string{instanceId}, nil)
+	}
+
 	if err != nil {
 		err := fmt.Errorf("Error finding source instance (%s): %s", instanceId, err)
 		state.Put("error", err)