openstack
/
nova
Code Issues Proposed changes

Merge "libvirt: fix alternative_device_name for detaching interfaces" into stable/newton

This commit is contained in:
Jenkins 2017-08-16 19:53:19 +00:00 committed by Gerrit Code Review
parent 68a07f8b9b 2cf2b7ea64
commit a91caa1baf
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/virt/libvirt/driver.py
View File

@ -1363,7 +1363,7 @@ class LibvirtDriver(driver.ComputeDriver):
# timeout.
wait_for_detach = guest.detach_device_with_retry(
guest.get_interface_by_cfg, cfg, live=live,
alternative_device_name=vif.get('address'))
alternative_device_name=self.vif_driver.get_vif_devname(vif))
wait_for_detach()
except exception.DeviceNotFound:
# The interface is gone so just log it as a warning.

6
nova/virt/libvirt/guest.py
View File

@ -415,9 +415,11 @@ class Guest(object):
persistent = self.has_persistent_configuration()
LOG.debug('Attempting initial detach for device %s', device)
LOG.debug('Attempting initial detach for device %s',
alternative_device_name)
_try_detach_device(conf, persistent, live)
LOG.debug('Start retrying detach until device %s is gone.', device)
LOG.debug('Start retrying detach until device %s is gone.',
alternative_device_name)
@loopingcall.RetryDecorator(max_retry_count=max_retry_count,
inc_sleep_time=inc_sleep_time,