Merge pull request #4204 from jtopjian/jtopjian-openstack-deleting-volume

provider/openstack: Handle volumes in "deleting" state

builtin/providers/openstack/resource_openstack_blockstorage_volume_v1.go

@@ -259,9 +259,13 @@ func resourceBlockStorageVolumeV1Delete(d *schema.ResourceData, meta interface{}
 		}
 	}
 
-	err = volumes.Delete(blockStorageClient, d.Id()).ExtractErr()
-	if err != nil {
-		return fmt.Errorf("Error deleting OpenStack volume: %s", err)
+	// It's possible that this volume was used as a boot device and is currently
+	// in a "deleting" state from when the instance was terminated.
+	// If this is true, just move on. It'll eventually delete.
+	if v.Status != "deleting" {
+		if err := volumes.Delete(blockStorageClient, d.Id()).ExtractErr(); err != nil {
+			return CheckDeleted(d, err, "volume")
+		}
 	}
 
 	// Wait for the volume to delete before moving on.