diff options
Diffstat (limited to 'ironic/drivers/modules/agent_base.py')
| -rw-r--r-- | ironic/drivers/modules/agent_base.py | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/ironic/drivers/modules/agent_base.py b/ironic/drivers/modules/agent_base.py index f7975c25c..5c4f94f04 100644 --- a/ironic/drivers/modules/agent_base.py +++ b/ironic/drivers/modules/agent_base.py @@ -334,11 +334,6 @@ class HeartbeatMixin(object): :param task: a TaskManager instance :returns: True if the current deploy step is deploy.deploy. """ - # TODO(mgoddard): Remove this 'if' in the Train release, after the - # deprecation period for supporting drivers with no deploy steps. - if not task.node.driver_internal_info.get('deploy_steps'): - return True - step = task.node.deploy_step return (step and step['interface'] == 'deploy' @@ -851,15 +846,7 @@ class AgentDeployMixin(HeartbeatMixin): # powered off. log_and_raise_deployment_error(task, msg, collect_logs=False, exc=e) - - if not node.deploy_step: - # TODO(rloo): delete this 'if' part after deprecation period, when - # we expect all (out-of-tree) drivers to support deploy steps. - # After which we will always notify_conductor_resume_deploy(). - task.process_event('done') - LOG.info('Deployment to node %s done', task.node.uuid) - else: - manager_utils.notify_conductor_resume_deploy(task) + manager_utils.notify_conductor_resume_deploy(task) @METRICS.timer('AgentDeployMixin.prepare_instance_to_boot') def prepare_instance_to_boot(self, task, root_uuid, efi_sys_uuid, |