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

set MASTER to correct nic in Postage.pm to support service node pools

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2874 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
linggao
2009-03-11 17:22:43 +00:00
parent 96d44cd4c8
commit 750dd3c270
2 changed files with 97 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,10 +133,16 @@ 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']);
my $et = $noderestab->getNodeAttribs($node,['xcatmaster', 'servicenode']);
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);
}
}
push @scriptd, "$attribute=".$value."\n";
push @scriptd, "export $attribute\n";

89
perl-xCAT/xCAT/Utils.pm
View File

@@ -3416,4 +3416,93 @@ sub CheckVersion
return 0;
}
#-------------------------------------------------------------------------------
=head3 getFacingIP
Gets the ip address of the adapter of the localhost that is facing the
the given node.
Arguments:
The name of the node that is facing the localhost.
Returns:
The ip address of the adapter that faces the node.
=cut
#-------------------------------------------------------------------------------
sub getFacingIP {
my ($class, $node) = @_;
my $ip;
my $cmd;
my @ipaddress;
my $nodeip = inet_ntoa(inet_aton($node));
unless ($nodeip =~ /\d+\.\d+\.\d+\.\d+/)
{
return 0; #Not supporting IPv6 here IPV6TODO
}
$cmd = "ifconfig" . " -a";
$cmd = $cmd . "| grep \"inet \"";
my @result = xCAT::Utils->runcmd($cmd, 0);
if ($::RUNCMD_RC != 0)
{
xCAT::MsgUtils->message("S", "Error from $cmd\n");
exit $::RUNCMD_RC;
}
# split node address
my ($n1, $n2, $n3, $n4) = split('\.', $nodeip);
foreach my $addr (@result)
{
my $ip;
my $mask;
if (xCAT::Utils->isLinux())
{
my ($inet, $addr1, $Bcast, $Mask) = split(" ", $addr);
if ((!$addr1) || (!$Mask)) { next; }
my @ips = split(":", $addr1);
my @masks=split(":", $Mask);
$ip=$ips[1];
$mask=$masks[1];
}
else
{ #AIX
my ($inet, $addr1, $netmask, $mask1, $Bcast, $bcastaddr) = split(" ", $addr);
if ((!$addr1) && (!$mask1)) { next;}
$ip=$addr1;
$mask1 =~ s/0x//;
$mask=`printf "%d.%d.%d.%d" \$(echo "$mask1" | sed 's/../0x& /g')`;
}
if($ip && $mask) {
# split interface IP
my ($h1, $h2, $h3, $h4) = split('\.', $ip);
# split mask
my ($m1, $m2, $m3, $m4) = split('\.', $mask);
# AND this interface IP with the netmask of the network
my $a1 = ((int $h1) & (int $m1));
my $a2 = ((int $h2) & (int $m2));
my $a3 = ((int $h3) & (int $m3));
my $a4 = ((int $h4) & (int $m4));
# AND node IP with the netmask of the network
my $b1 = ((int $n1) & (int $m1));
my $b2 = ((int $n2) & (int $m2));
my $b3 = ((int $n3) & (int $m3));
my $b4 = ((int $n4) & (int $m4));
if ( ($b1 == $a1) && ($b2 ==$a2) && ($b3 == $a3) && ($b4 == $a4)) {
return $ip;
}
}
}
xCAT::MsgUtils->message("S", "Cannot find master for the node $node\n");
return 0;
}
1;