diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-05 02:58:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-05 02:58:34 +0000 |
| commit | fd109710a4b3bd5596fe214567e19aeeffef50ec (patch) | |
| tree | fcd5f69c5abe4cf72303d8b467d371cd615bfd44 | |
| parent | e7f50c38a819683b293962e4c4fbf886bfaef195 (diff) | |
| parent | a053c4480caffbc62bbbd98b4583cba09fe5822a (diff) | |
| download | nova-fd109710a4b3bd5596fe214567e19aeeffef50ec.tar.gz nova-fd109710a4b3bd5596fe214567e19aeeffef50ec.tar.xz nova-fd109710a4b3bd5596fe214567e19aeeffef50ec.zip | |
Merge "Make cells_api fetch stashed instance_type info"
| -rw-r--r-- | nova/compute/cells_api.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/cells_api.py b/nova/compute/cells_api.py index 7f7a59b33..e2c2a9a4a 100644 --- a/nova/compute/cells_api.py +++ b/nova/compute/cells_api.py @@ -322,8 +322,8 @@ class ComputeCellsAPI(compute_api.API): if not flavor_id: new_instance_type = old_instance_type else: - new_instance_type = instance_types.get_instance_type_by_flavor_id( - flavor_id) + new_instance_type = instance_types.extract_instance_type(instance, + 'new_') # NOTE(johannes): Later, when the resize is confirmed or reverted, # the superclass implementations of those methods will need access |