openstack
/
nova
Code Issues Proposed changes

Merge "nova-net: Remove now unnecessary nova-net workaround"

This commit is contained in:
Zuul 2020-02-05 18:38:40 +00:00 committed by Gerrit Code Review
parent 097c31d4b4 8e5adb231f
commit 8f9d3c1646
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nova/compute/api.py
View File

@ -65,7 +65,6 @@ from nova.network import model as network_model
from nova.network import neutron
from nova.network import security_group_api
from nova import objects
from nova.objects import base as obj_base
from nova.objects import block_device as block_device_obj
from nova.objects import external_event as external_event_obj
from nova.objects import fields as fields_obj
@ -2390,17 +2389,7 @@ class API(base.Base):
delete_type if delete_type != 'soft_delete' else 'delete'):
elevated = context.elevated()
orig_host = instance.host
try:
if instance.vm_state == vm_states.SHELVED_OFFLOADED:
sysmeta = getattr(instance,
obj_base.get_attrname(
'system_metadata'))
instance.host = sysmeta.get('shelved_host')
self.network_api.deallocate_for_instance(elevated,
instance)
finally:
instance.host = orig_host
self.network_api.deallocate_for_instance(elevated, instance)
# cleanup volumes
self._local_cleanup_bdm_volumes(bdms, instance, context)