diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-26 21:20:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-26 21:20:39 +0000 |
| commit | bcae3c0427d78a7ba1b043db60e7aba2eece9695 (patch) | |
| tree | fb684ad56fa45c71a342e6212e260bb7625c3f3e | |
| parent | 575ad8f77dc7095c8a0ba9dd8deb41bf2fddae1f (diff) | |
| parent | 80a55176e11da1594c9d663df0e4a0a755018c16 (diff) | |
| download | nova-bcae3c0427d78a7ba1b043db60e7aba2eece9695.tar.gz nova-bcae3c0427d78a7ba1b043db60e7aba2eece9695.tar.xz nova-bcae3c0427d78a7ba1b043db60e7aba2eece9695.zip | |
Merge "Don't set instance ACTIVE until it's really active"
| -rw-r--r-- | nova/compute/manager.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index efe560911..7c8d24eda 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1226,6 +1226,9 @@ class ComputeManager(manager.SchedulerDependentManager): old_instance_type = migration_ref['old_instance_type_id'] instance_type = instance_types.get_instance_type(old_instance_type) + self.driver.finish_revert_migration(instance_ref, + self._legacy_nw_info(network_info)) + # 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, @@ -1239,8 +1242,6 @@ class ComputeManager(manager.SchedulerDependentManager): vm_state=vm_states.ACTIVE, task_state=None) - self.driver.finish_revert_migration(instance_ref, - self._legacy_nw_info(network_info)) self.db.migration_update(context, migration_id, {'status': 'reverted'}) |