From 7c064529ab46b7fb2ec7e2f7d6ff3178ad40ed18 Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Tue, 20 Feb 2018 08:17:37 +0000 Subject: [PATCH] resource/aws_instance: Bump deletion timeout to 20mins --- aws/resource_aws_instance.go | 2 +- website/docs/r/instance.html.markdown | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index 48129a741b8..276ad1df00c 100644 --- 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 index e000150c782..2a691b0ea46 100644 --- 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