diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-17 23:46:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-17 23:46:31 +0000 |
| commit | bf0f41d141ebdf7ead1e3a4f34cca2a16ff75056 (patch) | |
| tree | eb1cfc42b10819974cf7d8d624a5b17d81cc4575 /nova/compute | |
| parent | b57b6d76328e22db56600e02ae531b6f68ad9f53 (diff) | |
| parent | 0fed513b695cd15aaca24d24926a1c7d13e63509 (diff) | |
| download | nova-bf0f41d141ebdf7ead1e3a4f34cca2a16ff75056.tar.gz nova-bf0f41d141ebdf7ead1e3a4f34cca2a16ff75056.tar.xz nova-bf0f41d141ebdf7ead1e3a4f34cca2a16ff75056.zip | |
Merge "Allow confirm_resize if instance is in 'deleting' status"
Diffstat (limited to 'nova/compute')
| -rwxr-xr-x | nova/compute/manager.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 11ec70e44..15d1d7d28 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -2239,7 +2239,8 @@ class ComputeManager(manager.SchedulerDependentManager): instance = self._instance_update(context, instance['uuid'], vm_state=vm_state, task_state=None, - expected_task_state=None) + expected_task_state=[None, + task_states.DELETING]) self._notify_about_instance_usage( context, instance, "resize.confirm.end", |