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

Merge pull request #6764 from Fodoj/increase-openstack-timeouts 

provider/openstack Increase timeouts for image resize, subnets and routers
This commit is contained in:
Joe Topjian 2016-05-19 08:07:19 -05:00
parent a2306ea7f0 2dc254af13
commit dd1bbca407
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -702,9 +702,9 @@ func resourceComputeInstanceV2Update(d *schema.ResourceData, meta interface{}) e
// old attachments and new attachments // old attachments and new attachments
oldAttachments, newAttachments := d.GetChange("volume") oldAttachments, newAttachments := d.GetChange("volume")
// for each old attachment, detach the volume // for each old attachment, detach the volume
oldAttachmentSet := oldAttachments.(*schema.Set).List() oldAttachmentSet := oldAttachments.(*schema.Set).List()
if blockClient, err := config.blockStorageV1Client(d.Get("region").(string)); err != nil { if blockClient, err := config.blockStorageV1Client(d.Get("region").(string)); err != nil {
return err return err
} else { } else {
@ -755,7 +755,7 @@ func resourceComputeInstanceV2Update(d *schema.ResourceData, meta interface{}) e
Pending: []string{"RESIZE"}, Pending: []string{"RESIZE"},
Target: []string{"VERIFY_RESIZE"}, Target: []string{"VERIFY_RESIZE"},
Refresh: ServerV2StateRefreshFunc(computeClient, d.Id()), Refresh: ServerV2StateRefreshFunc(computeClient, d.Id()),
Timeout: 3 * time.Minute, Timeout: 30 * time.Minute,
Delay: 10 * time.Second, Delay: 10 * time.Second,
MinTimeout: 3 * time.Second, MinTimeout: 3 * time.Second,
} }
@ -776,7 +776,7 @@ func resourceComputeInstanceV2Update(d *schema.ResourceData, meta interface{}) e
Pending: []string{"VERIFY_RESIZE"}, Pending: []string{"VERIFY_RESIZE"},
Target: []string{"ACTIVE"}, Target: []string{"ACTIVE"},
Refresh: ServerV2StateRefreshFunc(computeClient, d.Id()), Refresh: ServerV2StateRefreshFunc(computeClient, d.Id()),
Timeout: 3 * time.Minute, Timeout: 30 * time.Minute,
Delay: 10 * time.Second, Delay: 10 * time.Second,
MinTimeout: 3 * time.Second, MinTimeout: 3 * time.Second,
} }

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

@ -150,7 +150,7 @@ func resourceNetworkingRouterV2Create(d *schema.ResourceData, meta interface{})
Pending: []string{"BUILD", "PENDING_CREATE", "PENDING_UPDATE"}, Pending: []string{"BUILD", "PENDING_CREATE", "PENDING_UPDATE"},
Target: []string{"ACTIVE"}, Target: []string{"ACTIVE"},
Refresh: waitForRouterActive(networkingClient, n.ID), Refresh: waitForRouterActive(networkingClient, n.ID),
Timeout: 2 * time.Minute, Timeout: 10 * time.Minute,
Delay: 5 * time.Second, Delay: 5 * time.Second,
MinTimeout: 3 * time.Second, MinTimeout: 3 * time.Second,
} }
@ -235,7 +235,7 @@ func resourceNetworkingRouterV2Delete(d *schema.ResourceData, meta interface{})
Pending: []string{"ACTIVE"}, Pending: []string{"ACTIVE"},
Target: []string{"DELETED"}, Target: []string{"DELETED"},
Refresh: waitForRouterDelete(networkingClient, d.Id()), Refresh: waitForRouterDelete(networkingClient, d.Id()),
Timeout: 2 * time.Minute, Timeout: 10 * time.Minute,
Delay: 5 * time.Second, Delay: 5 * time.Second,
MinTimeout: 3 * time.Second, MinTimeout: 3 * time.Second,
} }

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

@ -155,7 +155,7 @@ func resourceNetworkingSubnetV2Create(d *schema.ResourceData, meta interface{})
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
Target: []string{"ACTIVE"}, Target: []string{"ACTIVE"},
Refresh: waitForSubnetActive(networkingClient, s.ID), Refresh: waitForSubnetActive(networkingClient, s.ID),
Timeout: 2 * time.Minute, Timeout: 10 * time.Minute,
Delay: 5 * time.Second, Delay: 5 * time.Second,
MinTimeout: 3 * time.Second, MinTimeout: 3 * time.Second,
} }
@ -257,7 +257,7 @@ func resourceNetworkingSubnetV2Delete(d *schema.ResourceData, meta interface{})
Pending: []string{"ACTIVE"}, Pending: []string{"ACTIVE"},
Target: []string{"DELETED"}, Target: []string{"DELETED"},
Refresh: waitForSubnetDelete(networkingClient, d.Id()), Refresh: waitForSubnetDelete(networkingClient, d.Id()),
Timeout: 2 * time.Minute, Timeout: 10 * time.Minute,
Delay: 5 * time.Second, Delay: 5 * time.Second,
MinTimeout: 3 * time.Second, MinTimeout: 3 * time.Second,
} }