From 6f76fb0702bbf00566bc84aa677739bd55e3bcc0 Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Wed, 23 Mar 2016 18:55:37 -0500 Subject: [PATCH] provider/aws: set ASG health_check_grace_period default to 300 Closes #5658 --- builtin/providers/aws/resource_aws_autoscaling_group.go | 2 +- builtin/providers/aws/resource_aws_autoscaling_group_test.go | 1 - .../source/docs/providers/aws/r/autoscaling_group.html.markdown | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/builtin/providers/aws/resource_aws_autoscaling_group.go b/builtin/providers/aws/resource_aws_autoscaling_group.go index fc47756c7..6c30fd495 100644 --- a/builtin/providers/aws/resource_aws_autoscaling_group.go +++ b/builtin/providers/aws/resource_aws_autoscaling_group.go @@ -80,7 +80,7 @@ func resourceAwsAutoscalingGroup() *schema.Resource { "health_check_grace_period": &schema.Schema{ Type: schema.TypeInt, Optional: true, - Computed: true, + Default: 300, }, "health_check_type": &schema.Schema{ diff --git a/builtin/providers/aws/resource_aws_autoscaling_group_test.go b/builtin/providers/aws/resource_aws_autoscaling_group_test.go index ed4d559ba..ec29cda49 100644 --- a/builtin/providers/aws/resource_aws_autoscaling_group_test.go +++ b/builtin/providers/aws/resource_aws_autoscaling_group_test.go @@ -555,7 +555,6 @@ resource "aws_autoscaling_group" "bar" { name = "foobar3-terraform-test" max_size = 5 min_size = 2 - health_check_grace_period = 300 health_check_type = "ELB" desired_capacity = 4 force_delete = true diff --git a/website/source/docs/providers/aws/r/autoscaling_group.html.markdown b/website/source/docs/providers/aws/r/autoscaling_group.html.markdown index 233fb6cfe..eb4fd97d0 100644 --- a/website/source/docs/providers/aws/r/autoscaling_group.html.markdown +++ b/website/source/docs/providers/aws/r/autoscaling_group.html.markdown @@ -54,7 +54,7 @@ The following arguments are supported: * `availability_zones` - (Optional) A list of AZs to launch resources in. Required only if you do not specify any `vpc_zone_identifier` * `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. * `desired_capacity` - (Optional) The number of Amazon EC2 instances that should be running in the group. (See also [Waiting for