From d977ef6b32dfcd0effe00fc9c7cb25ce81a9a927 Mon Sep 17 00:00:00 2001
From: sjing <sjing@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 13 Jun 2011 03:58:36 +0000
Subject: [PATCH] Convert the <xcatmaster> keyword to SN's interface as known
 by compute node.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9790 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/dhcp.pm | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 628aa3a95..f35ae4a7a 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -448,11 +448,13 @@ sub addrangedetection {
     my $trange;
     my $begin;
     my $end;
-
+    my $myip;
+    $myip = xCAT::Utils->my_ip_facing($net->{net});
+    
     # convert <xcatmaster> to nameserver IP
     if ($net->{nameservers} eq '<xcatmaster>')
     {
-        $netcfgs{$net->{net}}->{nameservers} = xCAT::InstUtils->convert_xcatmaster();
+        $netcfgs{$net->{net}}->{nameservers} = $myip;
     }
     else
     {
@@ -465,7 +467,7 @@ sub addrangedetection {
         # convert <xcatmaster> to nameserver IP
         if ($::XCATSITEVALS{nameservers} eq '<xcatmaster>')
         {
-            $netcfgs{$net->{net}}->{nameservers} = xCAT::InstUtils->convert_xcatmaster();
+            $netcfgs{$net->{net}}->{nameservers} = $myip;
         }
         else
         {
@@ -840,15 +842,7 @@ sub process_request
         }
         ($href) = $sitetab->getAttribs({key => 'nameservers'}, 'value');
         if ($href and $href->{value}) {
-            # convert <xcatmaster> to nameserver IP
-            if ($href->{value} eq '<xcatmaster>')
-            {
-                $sitenameservers = xCAT::InstUtils->convert_xcatmaster();
-            }
-            else
-            {
-                $sitenameservers = $href->{value};
-            }
+            $sitenameservers = $href->{value};
         }
         ($href) = $sitetab->getAttribs({key => 'ntpservers'}, 'value');
         if ($href and $href->{value}) {
@@ -1620,6 +1614,13 @@ sub addnet
                     );
                 }
             }
+
+            # convert <xcatmaster> to nameserver IP
+            if ($nameservers eq '<xcatmaster>')
+            {
+                $nameservers = $myip;
+            }
+            
             $nameservers=putmyselffirst($nameservers);
             $ntpservers=putmyselffirst($ntpservers);
             $logservers=putmyselffirst($logservers);