From 4de53d06d7d5af2b4cc91abcadfb0d6198896ffa Mon Sep 17 00:00:00 2001
From: wanghuaz <wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 5 Dec 2011 14:53:13 +0000
Subject: [PATCH] Fixing defect 3285568: if shardtftp is not set and the
 compute node is not resolved by xcatmaster, we will give one msg instead of
 quietly ignore it.  this will help a lot to find the problem's root cause. 
 The msg is not an error, since there are cases matching the above two
 conditions.  So this msg should not make too much noise if those two
 conditions are valid.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11126 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/pxe.pm     | 4 ++++
 xCAT-server/lib/xcat/plugins/vsmppxe.pm | 4 ++++
 xCAT-server/lib/xcat/plugins/xnba.pm    | 4 ++++
 xCAT-server/lib/xcat/plugins/yaboot.pm  | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/xCAT-server/lib/xcat/plugins/pxe.pm b/xCAT-server/lib/xcat/plugins/pxe.pm
index a776b2a51..f5c7dbd41 100644
--- a/xCAT-server/lib/xcat/plugins/pxe.pm
+++ b/xCAT-server/lib/xcat/plugins/pxe.pm
@@ -388,6 +388,10 @@ sub process_request {
    foreach (@rnodes) {
      if (xCAT::Utils->nodeonmynet($_)) {
         push @nodes,$_;
+      } else {
+         my $rsp;
+         $rsp->{data}->[0]="$_: stop configuration because of none sharedtftp and not on same network with its xcatmaster";
+         $callback->($rsp);
      }
    }
   } else {
diff --git a/xCAT-server/lib/xcat/plugins/vsmppxe.pm b/xCAT-server/lib/xcat/plugins/vsmppxe.pm
index f23eadb6f..764acf08a 100644
--- a/xCAT-server/lib/xcat/plugins/vsmppxe.pm
+++ b/xCAT-server/lib/xcat/plugins/vsmppxe.pm
@@ -284,6 +284,10 @@ sub process_request {
    foreach (@rnodes) {
      if (xCAT::Utils->nodeonmynet($_)) {
         push @nodes,$_;
+      } else {
+         my $rsp;
+         $rsp->{data}->[0]="$_: stop configuration because of none sharedtftp and not on same network with its xcatmaster";
+         $callback->($rsp);
      }
    }
   } else {
diff --git a/xCAT-server/lib/xcat/plugins/xnba.pm b/xCAT-server/lib/xcat/plugins/xnba.pm
index c0cb25ad5..8c80c85b1 100644
--- a/xCAT-server/lib/xcat/plugins/xnba.pm
+++ b/xCAT-server/lib/xcat/plugins/xnba.pm
@@ -409,6 +409,10 @@ sub process_request {
    foreach (@rnodes) {
      if (xCAT::Utils->nodeonmynet($_)) {
         push @nodes,$_;
+     } else {
+        my $rsp;
+        $rsp->{data}->[0]="$_: stop configuration because of none sharedtftp and not on same network with its xcatmaster";
+        $callback->($rsp);
      }
    }
   } else {
diff --git a/xCAT-server/lib/xcat/plugins/yaboot.pm b/xCAT-server/lib/xcat/plugins/yaboot.pm
index 32a1238e7..53cbbdcb3 100644
--- a/xCAT-server/lib/xcat/plugins/yaboot.pm
+++ b/xCAT-server/lib/xcat/plugins/yaboot.pm
@@ -392,6 +392,10 @@ sub process_request {
    foreach (@rnodes) {
      if (xCAT::Utils->nodeonmynet($_)) {
         push @nodes,$_;
+     } else {
+        my $rsp;
+        $rsp->{data}->[0]="$_: stop configuration because of none sharedtftp and not on same network with its xcatmaster";
+        $callback->($rsp);
      }
    }
   } else {