diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-09 17:04:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-09 17:04:29 +0000 |
| commit | fd00534df464095c780dd2e5a292b4d3696ad375 (patch) | |
| tree | e1bc386f9d024e82c48350b9247fc110e6653a50 /nova/compute | |
| parent | 13ac52d2c21d6e0df7c896b25c91bd7a53b1871c (diff) | |
| parent | fcdfa93b210a092894284f60309e660a3a058fde (diff) | |
Merge "Send updated instance model to schedule_prep_resize"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 7 |
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, |