From 767d5494d8b469804abcf18b6ca05ff110889e06 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 3 Mar 2009 16:37:11 +0000
Subject: [PATCH]  only read site.master and xcatmaster to set up master node,
 not the servicenode attribute from noderes

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2830 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/Schema.pm   | 2 +-
 perl-xCAT/xCAT/Template.pm | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm
index 54af73404..6a6de6683 100644
--- a/perl-xCAT/xCAT/Schema.pm
+++ b/perl-xCAT/xCAT/Schema.pm
@@ -513,7 +513,7 @@ site => {
    "  domain (DNS domain name used for the cluster)\n".
    "  installdir (the local directory name used to hold the node deployment pkgs)\n".
    "  installloc (location to mount the installdir from in format hostname:/path)\n".
-   "  sharedftp (set to no/0 if xCAT should not assume /tftpboot is mounted on all service nodes)\n".
+   "  sharedtftp (set to no/0 if xCAT should not assume /tftpboot is mounted on all service nodes)\n".
    "  xcatdport (port used by xcatd daemon for client/server communication)\n".
    "  xcatiport (port used by xcatd to receive install status updates from nodes)\n".
    "  timezone (e.g. America/New_York)\n".
diff --git a/perl-xCAT/xCAT/Template.pm b/perl-xCAT/xCAT/Template.pm
index 73647f691..db6cfeaab 100644
--- a/perl-xCAT/xCAT/Template.pm
+++ b/perl-xCAT/xCAT/Template.pm
@@ -46,10 +46,6 @@ sub subvars {
   if ($et and $et->{value}) {
       $master = $et->{value};
   }
-  $et = $noderestab->getNodeAttribs($node,['servicenode']);
-  if ($et and $et->{'servicenode'}) { 
-    $master = $et->{'servicenode'};
-  }
   $et = $noderestab->getNodeAttribs($node,['xcatmaster']);
   if ($et and $et->{'xcatmaster'}) { 
     $master = $et->{'xcatmaster'};