diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-13 21:32:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-13 21:32:18 +0000 |
| commit | ceb575d70d9e9acd414d29bb7cc9b93523fabd79 (patch) | |
| tree | 05451241522962a8240ba65421f6afaa26674db8 /nova/compute | |
| parent | f597dc5548d66530e68ff5809ac2c56b7edbc6d8 (diff) | |
| parent | 6b6633521c57422dfcdd1c0fbd8004c01bbe99cc (diff) | |
Merge "bug 899767: fix vif-plugging with live migration"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 3e69c425b..d75aad603 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1770,6 +1770,12 @@ class ComputeManager(manager.SchedulerDependentManager): # must be deleted for preparing next block migration if block_migration: self.driver.destroy(instance_ref, network_info) + else: + # self.driver.destroy() usually performs vif unplugging + # but we must do it explicitly here when block_migration + # is false, as the network devices at the source must be + # torn down + self.driver.unplug_vifs(instance_ref, network_info) LOG.info(_('Migrating %(i_name)s to %(dest)s finished successfully.') % locals()) |