diff options
| author | Rick Harris <rick.harris@rackspace.com> | 2011-05-18 11:56:55 -0500 |
|---|---|---|
| committer | Rick Harris <rick.harris@rackspace.com> | 2011-05-18 11:56:55 -0500 |
| commit | bb4f5bb4cb3a56fb066395f74781010d16d658c6 (patch) | |
| tree | c30225987da31b2ddd97b322ed4365e4358d5b04 /nova/compute | |
| parent | 88b3fa4513ed5cfe2befab692dc3371095f99d98 (diff) | |
| parent | d9a87dd0dcb703a84c5f642c323d7b2ff68410a6 (diff) | |
Merging trunk
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 923feaa59..11565c25e 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -628,7 +628,7 @@ class ComputeManager(manager.SchedulerDependentManager): 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=instance_type['name'], + dict(instance_type_id=instance_type['id'], memory_mb=instance_type['memory_mb'], vcpus=instance_type['vcpus'], local_gb=instance_type['local_gb'])) |