From 815aa333ec9afbe49aa0f2bded99e06834467738 Mon Sep 17 00:00:00 2001 From: Scott Hussey Date: Fri, 13 Apr 2018 13:45:30 -0500 Subject: [PATCH] [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 --- .../drivers/node/maasdriver/actions/node.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drydock_provisioner/drivers/node/maasdriver/actions/node.py b/drydock_provisioner/drivers/node/maasdriver/actions/node.py index 20e0ab20..56dfa9f3 100644 --- a/drydock_provisioner/drivers/node/maasdriver/actions/node.py +++ b/drydock_provisioner/drivers/node/maasdriver/actions/node.py @@ -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)