Merge pull request #1353 from hashicorp/f-aws-asg-fix-drain-delete

provider/aws: Fix issue with tainted ASG groups failing to re-create

builtin/providers/aws/resource_aws_autoscaling_group.go

@@ -287,7 +287,12 @@ func resourceAwsAutoscalingGroupDelete(d *schema.ResourceData, meta interface{})
 		return err
 	}
 
-	return nil
+	return resource.Retry(5*time.Minute, func() error {
+		if g, _ = getAwsAutoscalingGroup(d, meta); g != nil {
+			return fmt.Errorf("Auto Scaling Group still exists")
+		}
+		return nil
+	})
 }
 
 func getAwsAutoscalingGroup(