diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-17 21:01:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-17 21:02:00 +0000 |
| commit | e354ad9608255087637d7647992464f2ce198426 (patch) | |
| tree | 13c9b34a1d3f2d2503e631c60e2740ec0ce8f5ef /nova/virt/vmwareapi/vmops.py | |
| parent | ef5c2035e09ae06b9baf778b8991a927a0525eba (diff) | |
| parent | 901d61980dc8136b9393d80659b638e3eb6cddb4 (diff) | |
| download | nova-e354ad9608255087637d7647992464f2ce198426.tar.gz | |
Merge "VMware: detach cinder volume when instance destroyed"12.0.0a0
Diffstat (limited to 'nova/virt/vmwareapi/vmops.py')
| -rw-r--r-- | nova/virt/vmwareapi/vmops.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py index 7fb1f61d49..18b6847d01 100644 --- a/nova/virt/vmwareapi/vmops.py +++ b/nova/virt/vmwareapi/vmops.py @@ -979,9 +979,6 @@ class VMwareVMOps(object): 2. Un-register. 3. Delete the contents of the folder holding the VM related data. """ - if instance.task_state == task_states.RESIZE_REVERTING: - return - LOG.debug("Destroying instance", instance=instance) self._destroy_instance(instance, destroy_disks=destroy_disks) LOG.debug("Instance destroyed", instance=instance) |