Added service node pool for diskful and diskless installation

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11653 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz 2012-02-21 06:53:54 +00:00
parent f1db4ebf47
commit a854feea90

View File

@ -25,7 +25,6 @@ my $lastmachinepass;
my %tab_replacement=(
"noderes:nfsserver"=>"noderes:xcatmaster",
"noderes:tftpserver"=>"noderes:xcatmaster",
"noderes:xcatmaster"=>"site:key=master:value",
);
@ -69,6 +68,10 @@ sub subvars {
if ($et and $et->{value}) {
$master = $et->{value};
}
my $ipfn = xCAT::Utils->my_ip_facing($node);
if ($ipfn) {
$master = $ipfn;
}
$et = $noderestab->getNodeAttribs($node,['xcatmaster']);
if ($et and $et->{'xcatmaster'}) {
$master = $et->{'xcatmaster'};
@ -419,6 +422,12 @@ sub tabdb
$tabh->close;
unless($ent and defined($ent->{$field})) {
unless ($blankok) {
if ($field eq "xcatmaster") {
my $ipfn = xCAT::Utils->my_ip_facing($node);
if ($ipfn) {
return $ipfn;
}
}
#$tmplerr="Unable to find requested $field from $table, with $key";
my $rep=get_replacement($table,$key,$field);
if ($rep) {