airship
/
drydock
Code Issues Proposed changes

[Fix] Support deploying nodes w/o tags 

- The apply_platform task was not considered successful if a node had
  no kernel parameters or tags, so the deploy step would not start

Change-Id: I5e59e35ec666b3ff2741aae823366d0a39bf4490
This commit is contained in:
Scott Hussey 2018-04-13 13:45:30 -05:00 committed by Aaron Sheffield
parent 94d351b364
commit 815aa333ec
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drydock_provisioner/drivers/node/maasdriver/actions/node.py
View File

@ -1393,13 +1393,19 @@ class ApplyNodePlatform(BaseMaasAction):
self.task.add_status_msg(
msg=msg, error=False, ctx=n.name, ctx_type='node')
self.task.success(focus=n.get_id())
else:
msg = "No kernel parameters to apply for %s." % n.name
self.logger.debug(msg)
self.task.add_status_msg(
msg=msg, error=False, ctx=n.name, ctx_type='node')
self.task.success(focus=n.get_id())
except Exception as ex2:
self.task.failure(focus=n.get_id())
msg = "Error configuring kernel parameters for node %s" % (
n.name)
self.logger.error(msg + ": %s" % str(ex2))
self.task.add_status_msg(
msg=msg, error=True, ctx=n.name, ctx_type='node')
self.task.failure(focus=n.get_id())
continue
try:
@ -1436,12 +1442,18 @@ class ApplyNodePlatform(BaseMaasAction):
self.logger.info("Applied static tags to node %s" %
(n.name))
self.task.success(focus=n.get_id())
else:
msg = "No node tags to apply for %s." % n.name
self.logger.debug(msg)
self.task.add_status_msg(
msg=msg, error=False, ctx=n.name, ctx_type='node')
self.task.success(focus=n.get_id())
except Exception as ex3:
self.task.failure(focus=n.get_id())
msg = "Error configuring static tags for node %s" % (n.name)
self.logger.error(msg + ": " + str(ex3))
self.task.add_status_msg(
msg=msg, error=True, ctx=n.name, ctx_type='node')
self.task.failure(focus=n.get_id())
continue
self.task.set_status(hd_fields.TaskStatus.Complete)