diff options
| author | matt.dietz@rackspace.com <> | 2011-07-20 16:56:45 -0500 |
|---|---|---|
| committer | matt.dietz@rackspace.com <> | 2011-07-20 16:56:45 -0500 |
| commit | 76aab6d65fa35ae88f9b16acd4ee2968dfe049ce (patch) | |
| tree | a7176bf9cfe200e2a83e1a7c55fb50b7ef5b4bda /nova/compute | |
| parent | 77347efae5171e5a6ffa5af885c0ffd7220688cf (diff) | |
CHanges based on feedback
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index eb3996d29..01a7d195f 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -820,20 +820,24 @@ class ComputeManager(manager.SchedulerDependentManager): 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, - migration_ref['new_flavor_id']) - self.db.instance_update(context, instance_id, - dict(instance_type_id=instance_type['id'], - memory_mb=instance_type['memory_mb'], - vcpus=instance_type['vcpus'], - local_gb=instance_type['local_gb'])) + resize_instance = False + if migration_ref['old_flavor_id'] != migration_ref['new_flavor_id']: + instance_type = self.db.instance_type_get_by_flavor_id(context, + migration_ref['new_flavor_id']) + self.db.instance_update(context, instance_id, + dict(instance_type_id=instance_type['id'], + memory_mb=instance_type['memory_mb'], + vcpus=instance_type['vcpus'], + local_gb=instance_type['local_gb'])) + resize_instance = True # reload the updated instance ref # FIXME(mdietz): is there reload functionality? instance = self.db.instance_get(context, instance_id) network_info = self.network_api.get_instance_nw_info(context, instance) - self.driver.finish_resize(instance, disk_info, network_info) + self.driver.finish_resize(instance, disk_info, network_info, + resize_instance) self.db.migration_update(context, migration_id, {'status': 'finished', }) |