Make ELB resource timeout configurable with wait_for_ready_timeout #564

Author: jbarrick-mesosphere

aws/resource_aws_elb.go

@@ -246,6 +246,14 @@ func resourceAwsElb() *schema.Resource {
 			},
 
 			"tags": tagsSchema(),
+
+			"wait_for_ready_timeout": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "5m",
+				ValidateFunc: validateDuration,
+			},
+
 		},
 	}
 }
@@ -295,8 +303,13 @@ func resourceAwsElbCreate(d *schema.ResourceData, meta interface{}) error {
 		elbOpts.Subnets = expandStringList(v.(*schema.Set).List())
 	}
 
+	waitForReadyTimeOut, err := time.ParseDuration(d.Get("wait_for_ready_timeout").(string))
+	if err != nil {
+		return err
+	}
+
 	log.Printf("[DEBUG] ELB create configuration: %#v", elbOpts)
-	err = resource.Retry(5*time.Minute, func() *resource.RetryError {
+	err = resource.Retry(waitForReadyTimeOut, func() *resource.RetryError {
 		_, err := elbconn.CreateLoadBalancer(elbOpts)
 
 		if err != nil {

website/docs/r/elb.html.markdown

@@ -89,6 +89,9 @@ The following arguments are supported:
 * `connection_draining` - (Optional) Boolean to enable connection draining. Default: `false`
 * `connection_draining_timeout` - (Optional) The time in seconds to allow for connections to drain. Default: `300`
 * `tags` - (Optional) A mapping of tags to assign to the resource.
+* `wait_for_ready_timeout` - (Default: `5m`) The maximum
+  [duration](https://golang.org/pkg/time/#ParseDuration) that Terraform should
+  wait for an ELB to be in a ready state before timing out.
 
 Exactly one of `availability_zones` or `subnets` must be specified: this
 determines if the ELB exists in a VPC or in EC2-classic.