summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorMark Washenberger <mark.washenberger@rackspace.com>2011-05-18 19:30:58 -0400
committerMark Washenberger <mark.washenberger@rackspace.com>2011-05-18 19:30:58 -0400
commit563a438df8c36fc351894f1695c4d533bf20f74e (patch)
treee01c9013a0efb7f7ed671e509d23043ebed760f2 /nova/compute
parent79d505c015bff1598e8e896f6198d65d90095ba6 (diff)
parent92db39bdb439f693ed59626d8c58f03e470d31f6 (diff)
merge lp:nova
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/manager.py2
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']))