diff options
| author | Zuul <zuul@review.opendev.org> | 2020-06-23 22:55:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-06-23 22:55:26 +0000 |
| commit | 0519b34647f9bebb1912a2765f0e52e9a8b7928c (patch) | |
| tree | 4056043b20f72c38bbea3081b16c7129dae42676 /ironic/conductor | |
| parent | 27459cf8c5bda84ff2fedcbd84afa7b005a87b4e (diff) | |
| parent | f0803493de07ba5573cf0ab0e607e8c5113dcb81 (diff) | |
| download | ironic-0519b34647f9bebb1912a2765f0e52e9a8b7928c.tar.gz | |
Merge "Fix fast-track with the direct deploy interface"
Diffstat (limited to 'ironic/conductor')
| -rw-r--r-- | ironic/conductor/deployments.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ironic/conductor/deployments.py b/ironic/conductor/deployments.py index 75308482d..d0d3acc39 100644 --- a/ironic/conductor/deployments.py +++ b/ironic/conductor/deployments.py @@ -286,7 +286,8 @@ def do_next_deploy_step(task, step_index, conductor_id): LOG.info('Deploy step %(step)s on node %(node)s being ' 'executed asynchronously, waiting for driver.', {'node': node.uuid, 'step': step}) - task.process_event('wait') + if task.node.provision_state != states.DEPLOYWAIT: + task.process_event('wait') return elif result is not None: # NOTE(rloo): This is an internal/dev error; shouldn't happen. |