Merge pull request #2037 from hashicorp/f-aws-iam-instance-bug

provider/aws: Retry RunInstance if IAM profile hasn't propagated
hashicorp · May 22, 2015 · 338bb50 · 338bb50
2 parents 22ae6e9 + a2baf1d
commit 338bb50
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/builtin/providers/aws/resource_aws_instance.go b/builtin/providers/aws/resource_aws_instance.go
@@ -517,7 +517,21 @@ func resourceAwsInstanceCreate(d *schema.ResourceData, meta interface{}) error {
 	// Create the instance
 	log.Printf("[DEBUG] Run configuration: %#v", runOpts)
 	var err error
-	runResp, err := conn.RunInstances(runOpts)
+
+	var runResp *ec2.Reservation
+	for i := 0; i < 5; i++ {
+		runResp, err = conn.RunInstances(runOpts)
+		if awsErr, ok := err.(awserr.Error); ok {
+			// IAM profiles can take ~10 seconds to propagate in AWS:
+			//  http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html#launch-instance-with-role-console
+			if awsErr.Code() == "InvalidParameterValue" && strings.Contains(awsErr.Message(), "Invalid IAM Instance Profile") {
+				log.Printf("[DEBUG] Invalid IAM Instance Profile referenced, retrying...")
+				time.Sleep(2 * time.Second)
+				continue
+			}
+		}
+		break
+	}
 	if err != nil {
 		return fmt.Errorf("Error launching source instance: %s", err)
 	}