From 95fecae314dc6990c71b5ca39dd69dbf85eeadaf Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Thu, 15 Sep 2016 16:34:44 -0400
Subject: [PATCH] BMC temp nodes are not deleted after compute node discovered

---
 xCAT-server/lib/xcat/plugins/nodediscover.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/nodediscover.pm b/xCAT-server/lib/xcat/plugins/nodediscover.pm
index bf512cce7..197591743 100644
--- a/xCAT-server/lib/xcat/plugins/nodediscover.pm
+++ b/xCAT-server/lib/xcat/plugins/nodediscover.pm
@@ -424,7 +424,14 @@ sub process_request {
         if (defined($request->{bmc_node}) and defined($request->{bmc_node}->[0])) {
             my $bmc_node = $request->{bmc_node}->[0];
             syslog("local4|info", "Found node corresponding to BMC=$bmc_node, removing it...");
-            $doreq->({ command => ['rmdef'], arg => [$bmc_node] });
+            my $rmcmd = "rmdef $bmc_node";
+            xCAT::Utils->runcmd($rmcmd, 0);
+            if ($::RUNCMD_RC != 0)
+            {
+                syslog("local4|info", "Failed to remove $bmc_node from xCAT");
+            } else {
+                syslog("local4|info", "$bmc_node definition removed from xCAT");
+            }
         }
     } else {