diff options
| author | Zuul <zuul@review.opendev.org> | 2022-08-04 14:02:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-08-04 14:02:38 +0000 |
| commit | 7f5279edc9531c34879f9b1a94e5e8f42a3dcf44 (patch) | |
| tree | 455a7357569835448f0f5988f52ff3cf808ba47d /nova/compute/api.py | |
| parent | 3b4378c1890337a096b26f1a5335620d475cb778 (diff) | |
| parent | db919aa15f24c0d74f3c5c0e8341fad3f2392e57 (diff) | |
| download | nova-7f5279edc9531c34879f9b1a94e5e8f42a3dcf44.tar.gz | |
Merge "For evacuation, ignore if task_state is not None"
Diffstat (limited to 'nova/compute/api.py')
| -rw-r--r-- | nova/compute/api.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 112a318f1d..26ae3cf0f3 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -5557,7 +5557,7 @@ class API: @reject_vtpm_instances(instance_actions.EVACUATE) @block_accelerators(until_service=SUPPORT_ACCELERATOR_SERVICE_FOR_REBUILD) @check_instance_state(vm_state=[vm_states.ACTIVE, vm_states.STOPPED, - vm_states.ERROR]) + vm_states.ERROR], task_state=None) def evacuate(self, context, instance, host, on_shared_storage, admin_password=None, force=None): """Running evacuate to target host. @@ -5584,7 +5584,7 @@ class API: context, instance.uuid) instance.task_state = task_states.REBUILDING - instance.save(expected_task_state=[None]) + instance.save(expected_task_state=None) self._record_action_start(context, instance, instance_actions.EVACUATE) # NOTE(danms): Create this as a tombstone for the source compute |