diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-03-17 11:03:07 -0500 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-03-17 11:03:07 -0500 |
| commit | 4f1f5bb1ed2cbb57e9ba8ea481ae31c0e6acc7bd (patch) | |
| tree | 989fd388fa5c43d5a2d23c7c8ffc3333af9a5d47 /nova/compute | |
| parent | aa13754d04c17ae9985017e22ae4f68916bc2781 (diff) | |
refactoring
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index b8c3c24cd..6b784f1e3 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -463,7 +463,7 @@ class ComputeManager(manager.Manager): vcpus=instance_type['vcpus'], local_gb=instance_type['local_gb'])) - self.driver._start(instance_ref) + self.driver.revert_resize(instance_ref) self.db.migration_update(context, migration_id, {'status': 'reverted'}) @@ -514,8 +514,6 @@ class ComputeManager(manager.Manager): self.db.migration_update(context, migration_id, {'status': 'post-migrating', }) - - service = self.db.service_get_by_host_and_topic(context, migration_ref['dest_compute'], FLAGS.compute_topic) topic = self.db.queue_get_for(context, FLAGS.compute_topic, @@ -536,7 +534,6 @@ class ComputeManager(manager.Manager): migration_ref = self.db.migration_get(context, migration_id) instance_ref = self.db.instance_get(context, migration_ref['instance_id']) - #TODO(mdietz): apply the rest of the instance_type attributes going #after they're supported instance_type = self.db.instance_type_get_by_flavor_id(context, |