diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-15 00:27:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-15 00:27:39 +0000 |
| commit | cc12819adef88983ef78e9bfb18745df9c39b561 (patch) | |
| tree | 754f450506eb0ec29831d6b4246767b05ff8a8f2 /nova/compute | |
| parent | 9e4131741b3c767f97408442048a639a66a3d780 (diff) | |
| parent | cb1c1d406b98e492931ff19e29735aa592a99f15 (diff) | |
Merge "Added resize support for Libvirt/KVM."
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 159aa8c76..3639541ff 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1152,6 +1152,7 @@ class ComputeManager(manager.SchedulerDependentManager): migration_ref = self.db.migration_get(context, migration_id) instance_ref = self.db.instance_get_by_uuid(context, migration_ref.instance_uuid) + network_info = self._get_instance_nw_info(context, instance_ref) self._notify_about_instance_usage(instance_ref, "resize.revert.start") @@ -1171,7 +1172,8 @@ class ComputeManager(manager.SchedulerDependentManager): vm_state=vm_states.ACTIVE, task_state=None) - self.driver.finish_revert_migration(instance_ref) + self.driver.finish_revert_migration(instance_ref, + self._legacy_nw_info(network_info)) self.db.migration_update(context, migration_id, {'status': 'reverted'}) @@ -1239,6 +1241,7 @@ class ComputeManager(manager.SchedulerDependentManager): instance_type_ref = self.db.instance_type_get(context, migration_ref.new_instance_type_id) + network_info = self._get_instance_nw_info(context, instance_ref) self.db.migration_update(context, migration_id, {'status': 'migrating'}) @@ -1246,7 +1249,7 @@ class ComputeManager(manager.SchedulerDependentManager): try: disk_info = self.driver.migrate_disk_and_power_off( context, instance_ref, migration_ref['dest_host'], - instance_type_ref) + instance_type_ref, self._legacy_nw_info(network_info)) except Exception, error: with utils.save_and_reraise_exception(): msg = _('%s. Setting instance vm_state to ERROR') |