summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorChris Behrens <cbehrens@codestud.com>2012-08-08 20:49:27 +0000
committerChris Behrens <cbehrens@codestud.com>2012-08-09 16:45:12 +0000
commitfcdfa93b210a092894284f60309e660a3a058fde (patch)
tree726fa1a6f22e581af3c71f380c0896dc8bd05dcd /nova/compute
parentf1c0a84be4dc1be15cb2b2c2676b9243fd24bd3d (diff)
Send updated instance model to schedule_prep_resize
A stale instance model was being passed to schedule_prep_resize. Fixes bug 1034595 Change-Id: Ic92a22a2c315d25c70d32685fdf9f38451077b9a
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/api.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 0122e175a..7164930f0 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -1427,11 +1427,8 @@ class API(base.Base):
if (current_memory_mb == new_memory_mb) and flavor_id:
raise exception.CannotResizeToSameSize()
- self.update(context,
- instance,
- task_state=task_states.RESIZE_PREP,
- progress=0,
- **kwargs)
+ instance = self.update(context, instance,
+ task_state=task_states.RESIZE_PREP, progress=0, **kwargs)
request_spec = {
'instance_type': new_instance_type,