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

Volume Pending States 

This commit adds pending states for volume attachment, detachment,
and deletion.
This commit is contained in:
Joe Topjian 2015-03-13 22:24:13 +00:00 committed by Jon Perritt
parent f5feb7fbbb
commit f011462e30
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,7 +264,7 @@ func resourceBlockStorageVolumeV1Delete(d *schema.ResourceData, meta interface{}
} }
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
Pending: []string{"in-use"}, Pending: []string{"in-use", "attaching"},
Target: "available", Target: "available",
Refresh: VolumeV1StateRefreshFunc(blockStorageClient, d.Id()), Refresh: VolumeV1StateRefreshFunc(blockStorageClient, d.Id()),
Timeout: 10 * time.Minute, Timeout: 10 * time.Minute,
@ -290,7 +290,7 @@ func resourceBlockStorageVolumeV1Delete(d *schema.ResourceData, meta interface{}
log.Printf("[DEBUG] Waiting for volume (%s) to delete", d.Id()) log.Printf("[DEBUG] Waiting for volume (%s) to delete", d.Id())
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
Pending: []string{"deleting"}, Pending: []string{"deleting", "available"},
Target: "deleted", Target: "deleted",
Refresh: VolumeV1StateRefreshFunc(blockStorageClient, d.Id()), Refresh: VolumeV1StateRefreshFunc(blockStorageClient, d.Id()),
Timeout: 10 * time.Minute, Timeout: 10 * time.Minute,

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

@ -944,6 +944,7 @@ func attachVolumesToInstance(computeClient *gophercloud.ServiceClient, blockClie
} }
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
Pending: []string{"attaching", "available"},
Target: "in-use", Target: "in-use",
Refresh: VolumeV1StateRefreshFunc(blockClient, va["volume_id"].(string)), Refresh: VolumeV1StateRefreshFunc(blockClient, va["volume_id"].(string)),
Timeout: 30 * time.Minute, Timeout: 30 * time.Minute,
@ -972,6 +973,7 @@ func detachVolumesFromInstance(computeClient *gophercloud.ServiceClient, blockCl
} }
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
Pending: []string{"detaching", "in-use"},
Target: "available", Target: "available",
Refresh: VolumeV1StateRefreshFunc(blockClient, va["volume_id"].(string)), Refresh: VolumeV1StateRefreshFunc(blockClient, va["volume_id"].(string)),
Timeout: 30 * time.Minute, Timeout: 30 * time.Minute,