# Pastebin 5XG3Zj6m diff --git a/ironic/drivers/modules/agent.py b/ironic/drivers/modules/agent.py index 8fc8ed73b..67fbfe8c1 100644 --- a/ironic/drivers/modules/agent.py +++ b/ironic/drivers/modules/agent.py @@ -705,6 +705,24 @@ class AgentRAID(base.RAIDInterface): """Return the properties of the interface.""" return {} + @METRICS.timer('AgentRAID.get_clean_steps') + def get_clean_steps(self, task): + """Get the list of clean steps from the agent. + + :param task: a TaskManager object containing the node + :raises NodeCleaningFailure: if the clean steps are not yet + available (cached), for example, when a node has just been + enrolled and has not been cleaned yet. + :returns: A list of clean step dictionaries + """ + new_priorities = { + 'delete_configuration': CONF.deploy.delete_configuration_priority, + 'create_configuration': CONF.deploy.create_configuration_priority + } + return agent_base.get_steps( + task, 'clean', interface='raid', + override_priorities=new_priorities) + @METRICS.timer('AgentRAID.create_configuration') @base.clean_step(priority=0) def create_configuration(self, task, diff --git a/ironic/drivers/modules/agent_base.py b/ironic/drivers/modules/agent_base.py index eae2a9731..473d82a65 100644 --- a/ironic/drivers/modules/agent_base.py +++ b/ironic/drivers/modules/agent_base.py @@ -674,8 +674,6 @@ class AgentDeployMixin(HeartbeatMixin): 'erase_devices': CONF.deploy.erase_devices_priority, 'erase_devices_metadata': CONF.deploy.erase_devices_metadata_priority, - 'delete_configuration': CONF.deploy.delete_configuration_priority, - 'create_configuration': CONF.deploy.create_configuration_priority } return get_steps( task, 'clean', interface='deploy',