diff options
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 515737992..eae7149e9 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1471,6 +1471,11 @@ class ComputeManager(manager.SchedulerDependentManager): self.network_api.setup_networks_on_host(context, instance, teardown=True) + if migration_ref['dest_compute'] != \ + migration_ref['source_compute']: + self.network_api.migrate_instance_start(context, instance, + migration_ref['dest_compute']) + network_info = self._get_instance_nw_info(context, instance) block_device_info = self._get_instance_volume_block_device_info( context, instance['uuid']) @@ -1532,6 +1537,11 @@ class ComputeManager(manager.SchedulerDependentManager): self._legacy_nw_info(network_info), block_device_info) + if migration_ref['dest_compute'] != \ + migration_ref['source_compute']: + self.network_api.migrate_instance_finish(context, instance, + migration_ref['source_compute']) + # Just roll back the record. There's no need to resize down since # the 'old' VM already has the preferred attributes self._instance_update(context, @@ -1659,6 +1669,11 @@ class ComputeManager(manager.SchedulerDependentManager): self.volume_api.terminate_connection(context, volume, connector) + if migration_ref['dest_compute'] != \ + migration_ref['source_compute']: + self.network_api.migrate_instance_start(context, instance, + self.host) + self.db.migration_update(context, migration_id, {'status': 'post-migrating'}) @@ -1697,6 +1712,11 @@ class ComputeManager(manager.SchedulerDependentManager): self.network_api.setup_networks_on_host(context, instance, migration_ref['dest_compute']) + if migration_ref['dest_compute'] != \ + migration_ref['source_compute']: + self.network_api.migrate_instance_finish(context, instance, + migration_ref['dest_compute']) + network_info = self._get_instance_nw_info(context, instance) self._instance_update(context, instance['uuid'], |