ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1646 from pmoust/elb-default-idle-timeout 

providers/aws: aws_elb incr. idle_timeout to 60s
This commit is contained in:
Mitchell Hashimoto 2015-04-23 12:27:46 +02:00
parent 381a0101b3 6bb8947d16
commit a4cfa2ef0c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/providers/aws/resource_aws_elb.go
View File

@ -84,7 +84,7 @@ func resourceAwsElb() *schema.Resource {
"idle_timeout": &schema.Schema{ "idle_timeout": &schema.Schema{
Type: schema.TypeInt, Type: schema.TypeInt,
Optional: true, Optional: true,
Default: 30, Default: 60,
}, },
"connection_draining": &schema.Schema{ "connection_draining": &schema.Schema{

2
website/source/docs/providers/aws/r/elb.html.markdown
View File

@ -62,7 +62,7 @@ The following arguments are supported:
* `listener` - (Required) A list of listener blocks. Listeners documented below. * `listener` - (Required) A list of listener blocks. Listeners documented below.
* `health_check` - (Optional) A health_check block. Health Check documented below. * `health_check` - (Optional) A health_check block. Health Check documented below.
* `cross_zone_load_balancing` - (Optional) Enable cross-zone load balancing. * `cross_zone_load_balancing` - (Optional) Enable cross-zone load balancing.
* `idle_timeout` - (Optional) The time in seconds that the connection is allowed to be idle. Default: 300. * `idle_timeout` - (Optional) The time in seconds that the connection is allowed to be idle. Default: 60.
* `connection_draining` - (Optional) Boolean to enable connection draining. * `connection_draining` - (Optional) Boolean to enable connection draining.
* `connection_draining_timeout` - (Optional) The time in seconds to allow for connections to drain. * `connection_draining_timeout` - (Optional) The time in seconds to allow for connections to drain.