Merge pull request #4223 from nicgrayson/increase-OS-timeout

provider/openstack: increase instance timeout from 10 to 30 minutes
hashicorp · Dec 9, 2015 · 8ebb74c · 8ebb74c
2 parents 8271c79 + ef9838c
commit 8ebb74c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/builtin/providers/openstack/resource_openstack_compute_instance_v2.go b/builtin/providers/openstack/resource_openstack_compute_instance_v2.go
@@ -404,7 +404,7 @@ func resourceComputeInstanceV2Create(d *schema.ResourceData, meta interface{}) e
 		Pending:    []string{"BUILD"},
 		Target:     "ACTIVE",
 		Refresh:    ServerV2StateRefreshFunc(computeClient, server.ID),
-		Timeout:    10 * time.Minute,
+		Timeout:    30 * time.Minute,
 		Delay:      10 * time.Second,
 		MinTimeout: 3 * time.Second,
 	}
@@ -791,7 +791,7 @@ func resourceComputeInstanceV2Delete(d *schema.ResourceData, meta interface{}) e
 		Pending:    []string{"ACTIVE"},
 		Target:     "DELETED",
 		Refresh:    ServerV2StateRefreshFunc(computeClient, d.Id()),
-		Timeout:    10 * time.Minute,
+		Timeout:    30 * time.Minute,
 		Delay:      10 * time.Second,
 		MinTimeout: 3 * time.Second,
 	}