diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-04 23:58:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-04 23:58:04 +0000 |
| commit | 65f784ccbf9e51018e77070c48e4e64e6e8b7c27 (patch) | |
| tree | e07007254ca82995430822dbc4d3c984b87375fc /nova/compute | |
| parent | 6d1a1dbb37fe084208dd2c25a2d00c78f04122d3 (diff) | |
| parent | 9f1b8228c93571552de4df73d1827dcd21498256 (diff) | |
Merge "Move instance_destroy() to conductor"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 498ec9829..ecfb53085 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1059,7 +1059,7 @@ class ComputeManager(manager.SchedulerDependentManager): terminated_at=timeutils.utcnow()) system_meta = compute_utils.metadata_to_dict( instance['system_metadata']) - self.db.instance_destroy(context, instance_uuid) + self.conductor_api.instance_destroy(context, instance) # ensure block device mappings are not leaked self.conductor_api.block_device_mapping_destroy(context, bdms) |