FSP/BPA redundancy: change the way of finding the fsp/bpa's IP address from checking hosts table to checking itself first.
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8641 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
parent
0c194d45fb
commit
d7971daed7
@ -2843,33 +2843,56 @@ sub getNodeIPaddress
|
||||
}
|
||||
}
|
||||
|
||||
my $hstab = xCAT::Table->new('hosts');
|
||||
if ( $hstab ) {
|
||||
my @myip = ();
|
||||
foreach ( @$c1 )
|
||||
{
|
||||
my $point= $hstab->getNodeAttribs($_, ['ip']);
|
||||
my $value = $point->{ip};
|
||||
push (@myip, $value);
|
||||
}
|
||||
$ips = join ",", @myip;
|
||||
return $ips;
|
||||
#my $hstab = xCAT::Table->new('hosts');
|
||||
#if ( $hstab ) {
|
||||
# my @myip = ();
|
||||
# foreach ( @$c1 )
|
||||
# {
|
||||
# my $point= $hstab->getNodeAttribs($_, ['ip']);
|
||||
# my $value = $point->{ip};
|
||||
# push (@myip, $value);
|
||||
# }
|
||||
# $ips = join ",", @myip;
|
||||
# return $ips;
|
||||
#}
|
||||
|
||||
#modify the way of finding IP address.
|
||||
my @myip = ();
|
||||
my @nonip =();
|
||||
foreach ( @$c1 )
|
||||
{
|
||||
my $ifip = isIpaddr($_);
|
||||
if ($ifip) {
|
||||
push (@myip, $_);
|
||||
} else {
|
||||
push (@nonip, $_);
|
||||
}
|
||||
}
|
||||
my $hstab = xCAT::Table->new('hosts');
|
||||
if ( $hstab ) {
|
||||
my $ent = $hstab->getNodesAttribs(\@nonip,['ip']);
|
||||
foreach ( @nonip) {
|
||||
push (@myip, $_);
|
||||
}
|
||||
}
|
||||
$ips = join ",", @myip;
|
||||
return $ips;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if ( $nodeip ) {
|
||||
return $nodeip;
|
||||
} else {
|
||||
return undef;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
=head3 thishostisnot
|
||||
|
Loading…
x
Reference in New Issue
Block a user