diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-12-07 16:36:30 -0500 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-01-04 17:00:34 +0000 |
| commit | 50f82d199cdbf34502c403af3d1669eedfa8fc24 (patch) | |
| tree | 52ab95970cc12882ff8b782c4cac6b29aa359fbb | |
| parent | b4cfd9ab1b78d8926072615d21cb7bd430b38612 (diff) | |
| download | nova-50f82d199cdbf34502c403af3d1669eedfa8fc24.tar.gz | |
Set instance['host'] to the original host value on revert resize.
Fixes bug #901445
Change-Id: I8c112d92d6a54715073ef1119372d782c3be37c9
| -rw-r--r-- | nova/compute/manager.py | 1 | ||||
| -rw-r--r-- | nova/tests/test_compute.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index b926eacc0b..5be075ba80 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -926,6 +926,7 @@ class ComputeManager(manager.SchedulerDependentManager): self._instance_update(context, instance_ref["uuid"], memory_mb=instance_type['memory_mb'], + host=migration_ref['source_compute'], vcpus=instance_type['vcpus'], local_gb=instance_type['local_gb'], instance_type_id=instance_type['id']) diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index c6747d0c67..9b5f27c2ed 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -695,6 +695,7 @@ class ComputeTestCase(test.TestCase): instance_type_ref = db.instance_type_get(context, inst_ref['instance_type_id']) self.assertEqual(instance_type_ref['flavorid'], 1) + self.assertEqual(inst_ref['host'], migration_ref['source_compute']) self.compute.terminate_instance(context, instance_id) |