Merge "libvirt: fix alternative_device_name for detaching interfaces" into stable/ocata
This commit is contained in:
commit
baba7b098b
|
@ -1452,7 +1452,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.
|
||||
|
|
|
@ -419,9 +419,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,
|
||||
|
|
Loading…
Reference in New Issue