Merge pull request #3452 from terraform-providers/b-instance-bump-del…

…etion-timeout resource/aws_instance: Bump deletion timeout to 20mins
hashicorp · Feb 20, 2018 · fd6f713 · fd6f713
2 parents 944a902 + 7c06452
commit fd6f713
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go
@@ -35,7 +35,7 @@ func resourceAwsInstance() *schema.Resource {
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(10 * time.Minute),
 			Update: schema.DefaultTimeout(10 * time.Minute),
-			Delete: schema.DefaultTimeout(10 * time.Minute),
+			Delete: schema.DefaultTimeout(20 * time.Minute),
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown
@@ -96,7 +96,7 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 * `create` - (Defaults to 10 mins) Used when launching the instance (until it reaches the initial `running` state)
 * `update` - (Defaults to 10 mins) Used when stopping and starting the instance when necessary during update - e.g. when changing instance type
-* `delete` - (Defaults to 10 mins) Used when terminating the instance
+* `delete` - (Defaults to 20 mins) Used when terminating the instance
 
 ### Block devices