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

Merge pull request #5830 from hashicorp/phinze/asg-health-check-grace-period-default 

provider/aws: set ASG health_check_grace_period default to 300
This commit is contained in:
Paul Stack 2016-03-30 19:05:06 -05:00
parent 22d0b63194 6f76fb0702
commit 8ed809456d
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,7 @@ func resourceAwsAutoscalingGroup() *schema.Resource {
"health_check_grace_period": &schema.Schema{ "health_check_grace_period": &schema.Schema{
Type: schema.TypeInt, Type: schema.TypeInt,
Optional: true, Optional: true,
Computed: true, Default: 300,
}, },
"health_check_type": &schema.Schema{ "health_check_type": &schema.Schema{

1
builtin/providers/aws/resource_aws_autoscaling_group_test.go
View File

@ -555,7 +555,6 @@ resource "aws_autoscaling_group" "bar" {
name = "foobar3-terraform-test" name = "foobar3-terraform-test"
max_size = 5 max_size = 5
min_size = 2 min_size = 2
health_check_grace_period = 300
health_check_type = "ELB" health_check_type = "ELB"
desired_capacity = 4 desired_capacity = 4
force_delete = true force_delete = true

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

@ -54,7 +54,7 @@ The following arguments are supported:
* `availability_zones` - (Optional) A list of AZs to launch resources in. * `availability_zones` - (Optional) A list of AZs to launch resources in.
Required only if you do not specify any `vpc_zone_identifier` Required only if you do not specify any `vpc_zone_identifier`
* `launch_configuration` - (Required) The name of the launch configuration to use. * `launch_configuration` - (Required) The name of the launch configuration to use.
* `health_check_grace_period` - (Optional) Time after instance comes into service before checking health. * `health_check_grace_period` - (Optional, Default: 300) Time (in seconds) after instance comes into service before checking health.
* `health_check_type` - (Optional) "EC2" or "ELB". Controls how health checking is done. * `health_check_type` - (Optional) "EC2" or "ELB". Controls how health checking is done.
* `desired_capacity` - (Optional) The number of Amazon EC2 instances that * `desired_capacity` - (Optional) The number of Amazon EC2 instances that
should be running in the group. (See also [Waiting for should be running in the group. (See also [Waiting for