Merge "Improvements for handling existing nodes"
This commit is contained in:
commit
6af445ac4a
|
@ -923,8 +923,7 @@ class ConfigureHardware(BaseMaasAction):
|
||||||
n, update_name=False)
|
n, update_name=False)
|
||||||
if machine is not None:
|
if machine is not None:
|
||||||
if machine.status_name in [
|
if machine.status_name in [
|
||||||
'New', 'Broken'
|
'New', 'Broken', 'Failed commissioning', 'Failed testing']:
|
||||||
] or machine.status_name.startswith('Failed'):
|
|
||||||
self.logger.debug(
|
self.logger.debug(
|
||||||
"Located node %s in MaaS, starting commissioning" %
|
"Located node %s in MaaS, starting commissioning" %
|
||||||
(n.name))
|
(n.name))
|
||||||
|
@ -964,14 +963,14 @@ class ConfigureHardware(BaseMaasAction):
|
||||||
ctx_type='node')
|
ctx_type='node')
|
||||||
self.task.success(focus=n.get_id())
|
self.task.success(focus=n.get_id())
|
||||||
self.collect_build_data(machine)
|
self.collect_build_data(machine)
|
||||||
elif machine.status_name == 'Commissioning':
|
elif machine.status_name in ['Commissioning', 'Testing']:
|
||||||
msg = "Located node %s in MaaS, node already being commissioned. Skipping..." % (
|
msg = "Located node %s in MaaS, node already being commissioned. Skipping..." % (
|
||||||
n.name)
|
n.name)
|
||||||
self.logger.info(msg)
|
self.logger.info(msg)
|
||||||
self.task.add_status_msg(
|
self.task.add_status_msg(
|
||||||
msg=msg, error=False, ctx=n.name, ctx_type='node')
|
msg=msg, error=False, ctx=n.name, ctx_type='node')
|
||||||
self.task.success(focus=n.get_id())
|
self.task.success(focus=n.get_id())
|
||||||
elif machine.status_name == 'Ready':
|
elif machine.status_name in ['Ready', 'Deploying', 'Allocated', 'Deployed']:
|
||||||
msg = "Located node %s in MaaS, node commissioned. Skipping..." % (
|
msg = "Located node %s in MaaS, node commissioned. Skipping..." % (
|
||||||
n.name)
|
n.name)
|
||||||
self.logger.info(msg)
|
self.logger.info(msg)
|
||||||
|
|
|
@ -522,6 +522,8 @@ class PrepareNodes(BaseAction):
|
||||||
node_check_task.node_filter_from_failures(), site_design)
|
node_check_task.node_filter_from_failures(), site_design)
|
||||||
|
|
||||||
# And log the nodes that were found so they can be addressed
|
# And log the nodes that were found so they can be addressed
|
||||||
|
known_nodes = self.orchestrator.process_node_filter(
|
||||||
|
node_check_task.node_filter_from_successes(), site_design)
|
||||||
|
|
||||||
for n in node_check_task.result.successes:
|
for n in node_check_task.result.successes:
|
||||||
self.logger.debug(
|
self.logger.debug(
|
||||||
|
@ -532,7 +534,6 @@ class PrepareNodes(BaseAction):
|
||||||
error=False,
|
error=False,
|
||||||
ctx=n,
|
ctx=n,
|
||||||
ctx_type='node')
|
ctx_type='node')
|
||||||
self.task.success(focus=n)
|
|
||||||
|
|
||||||
self.step_oob_set_netboot(target_nodes)
|
self.step_oob_set_netboot(target_nodes)
|
||||||
|
|
||||||
|
@ -565,6 +566,7 @@ class PrepareNodes(BaseAction):
|
||||||
target_nodes = self.orchestrator.process_node_filter(
|
target_nodes = self.orchestrator.process_node_filter(
|
||||||
self.task.node_filter_from_successes(), site_design)
|
self.task.node_filter_from_successes(), site_design)
|
||||||
|
|
||||||
|
target_nodes.extend(known_nodes)
|
||||||
self.step_node_configure_hw(node_driver, target_nodes)
|
self.step_node_configure_hw(node_driver, target_nodes)
|
||||||
|
|
||||||
self.task.bubble_results()
|
self.task.bubble_results()
|
||||||
|
|
Loading…
Reference in New Issue