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

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

provider/openstack: increase instance timeout from 10 to 30 minutes
This commit is contained in:
Joe Topjian 2015-12-08 22:19:05 -07:00
parent 8271c79b40 ef9838c796
commit 8ebb74cbff
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/providers/openstack/resource_openstack_compute_instance_v2.go
View File

@ -404,7 +404,7 @@ func resourceComputeInstanceV2Create(d *schema.ResourceData, meta interface{}) e
Pending: []string{"BUILD"}, Pending: []string{"BUILD"},
Target: "ACTIVE", Target: "ACTIVE",
Refresh: ServerV2StateRefreshFunc(computeClient, server.ID), Refresh: ServerV2StateRefreshFunc(computeClient, server.ID),
Timeout: 10 * time.Minute, Timeout: 30 * time.Minute,
Delay: 10 * time.Second, Delay: 10 * time.Second,
MinTimeout: 3 * time.Second, MinTimeout: 3 * time.Second,
} }
@ -791,7 +791,7 @@ func resourceComputeInstanceV2Delete(d *schema.ResourceData, meta interface{}) e
Pending: []string{"ACTIVE"}, Pending: []string{"ACTIVE"},
Target: "DELETED", Target: "DELETED",
Refresh: ServerV2StateRefreshFunc(computeClient, d.Id()), Refresh: ServerV2StateRefreshFunc(computeClient, d.Id()),
Timeout: 10 * time.Minute, Timeout: 30 * time.Minute,
Delay: 10 * time.Second, Delay: 10 * time.Second,
MinTimeout: 3 * time.Second, MinTimeout: 3 * time.Second,
} }