arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minor fix

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2884 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
linggao 2009-03-12 19:44:45 +00:00
parent 94ef48d536
commit 4e0fb1ef69
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
perl-xCAT/xCAT/Postage.pm
View File

@ -133,15 +133,11 @@ sub makescript {
push @scriptd, "SITEMASTER=".$value."\n";
push @scriptd, "export SITEMASTER\n";
# if node has service node as master then override site master
my $et = $noderestab->getNodeAttribs($node,['xcatmaster', 'servicenode']);
my $et = $noderestab->getNodeAttribs($node,['xcatmaster']);
if ($et and defined($et->{'xcatmaster'})) {
$value = $et->{'xcatmaster'};
}
if ($et and defined($et->{'servicenode'})) {
my $tmp = $et->{'servicenode'};
if ($tmp =~ /,/) { #service node pool case,use local host as the master
$value=xCAT::Utils->getFacingIP($node);
}
} else {
$value=xCAT::Utils->getFacingIP($node);
}
push @scriptd, "$attribute=".$value."\n";
push @scriptd, "export $attribute\n";

4
xCAT/postscripts/otherpkgs
View File

@ -39,7 +39,9 @@ fi
# SIP=`echo $SIP |awk -F\' '{print $2}'` #trim '
#fi
if [[ -z "$NFSSERVER" ]]; then
NFSSERVER=$MASTER
fi
if [[ $OTHERPKGS_HASREPO -eq 1 ]]; then
rpm -q yum