diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-16 02:55:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-16 02:55:27 +0000 |
| commit | 026943be287edaae4a34e430606d4923eb9c9824 (patch) | |
| tree | c8373b4bcd7e0bf1fd8ab481cd7e701a7e41b392 | |
| parent | 31cf494a50896bf41c2934a83e103ac92886a7b9 (diff) | |
| parent | 6657f70ee3e792b39e45a2a96fb5d4b380f0ae91 (diff) | |
Merge "Allow proper instance cleanup if state == SHUTOFF"
| -rw-r--r-- | nova/compute/manager.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index e91d5e9e3..e596f81af 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -673,13 +673,6 @@ class ComputeManager(manager.SchedulerDependentManager): # tear down allocated network structure self._deallocate_network(context, instance) - current_power_state = self._get_power_state(context, instance) - - if current_power_state == power_state.SHUTOFF: - self.db.instance_destroy(context, instance_id) - _msg = _('trying to destroy already destroyed instance: %s') - raise exception.Invalid(_msg % instance_uuid) - # NOTE(vish) get bdms before destroying the instance bdms = self._get_instance_volume_bdms(context, instance_id) block_device_info = self._get_instance_volume_block_device_info( |