From 9621b0511f9ecc9fbc43108cb1652804df8db88e Mon Sep 17 00:00:00 2001 From: jjhua Date: Fri, 18 May 2012 07:02:09 +0000 Subject: [PATCH] For the places that open site table to read attributes, change to call xCAT::Utils->get_site_attribute instead git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12788 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/perl/xCAT/Template.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-server/lib/perl/xCAT/Template.pm b/xCAT-server/lib/perl/xCAT/Template.pm index be7abc548..53011d54a 100644 --- a/xCAT-server/lib/perl/xCAT/Template.pm +++ b/xCAT-server/lib/perl/xCAT/Template.pm @@ -71,10 +71,10 @@ sub subvars { close($inh); my $master; #my $sitetab = xCAT::Table->new('site'); - #my $noderestab = xCAT::Table->new('noderes'); + my $noderestab = xCAT::Table->new('noderes'); #(my $et) = $sitetab->getAttribs({key=>"master"},'value'); my @masters = xCAT::Utils->get_site_attribute("master"); - my $tmp = $masters[0] + my $tmp = $masters[0]; if ( defined($tmp) ) { $master = $tmp; } @@ -82,7 +82,7 @@ sub subvars { if ($ipfn) { $master = $ipfn; } - $et = $noderestab->getNodeAttribs($node,['xcatmaster']); + my $et = $noderestab->getNodeAttribs($node,['xcatmaster']); if ($et and $et->{'xcatmaster'}) { $master = $et->{'xcatmaster'}; }