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

set up resolv.conf on backup SN

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.6@10540 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
nott
2011-09-16 19:30:56 +00:00
parent 96d7905028
commit e677086adc
1 changed files with 88 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT-server/lib/xcat/plugins/aixinstall.pm
+88 -7
View File
@@ -4295,6 +4295,32 @@ sub chk_resolv_conf
return 1;
}
#
# get all the possible IPs for the node I'm running on
#
my $ifgcmd = "ifconfig -a | grep 'inet '";
my @result = xCAT::Utils->runcmd($ifgcmd, 0);
if ($::RUNCMD_RC != 0)
{
my $rsp;
push @{$rsp->{data}}, "Could not run \'$ifgcmd\'.\n";
xCAT::MsgUtils->message("E", $rsp, $callback);
return 1;
}
my @myIPs;
foreach my $int (@result) {
my ($inet, $IP, $str) = split(" ", $int);
chomp $IP;
$IP =~ s/\/.*//; # ipv6 address 4000::99/64
$IP =~ s/\%.*//; # ipv6 address ::1%1/128
push @myIPs, $IP;
}
#
# check each node to make sure we have the correct resolv.conf
# for each one
#
foreach my $node (@nodelist) {
my $domain;
@@ -4340,9 +4366,36 @@ sub chk_resolv_conf
# - service node/network oriented
# then use xcatmaster value of node def
#ndebug
# with statelite we need to set up both primary and backup SNs
# see which one we are and set the correct server
my $xmast;
my ($sn1, $sn2) = split(/,/, $nodehash{$node}{servicenode});
# if I'm the primary SN then just use the
# the xcatmaster value.
if ($sn1) {
if (xCAT::InstUtils->is_me($sn1)) {
$xmast = $nodehash{$node}{xcatmaster};
}
}
# if I'm the backup SN then figure out which interface
# to use for the node server name (ie. xcatmaster value)
if ($sn2) {
if (xCAT::InstUtils->is_me($sn2)) {
foreach my $int (@myIPs) {
if ( xCAT::NetworkUtils->ishostinsubnet($int, $nethash{$node}{mask}, $nethash{$node}{net} )) {
$xmast = xCAT::NetworkUtils->gethostname($int);
last;
}
}
}
}
my $server;
if ($nodehash{$node}{xcatmaster}) {
$server=$nodehash{$node}{xcatmaster};
if ($xmast) {
$server=$xmast;
} else {
$server=$nimprime;
}
@@ -4376,12 +4429,40 @@ sub chk_resolv_conf
# service node oriented
# then use xcatmaster value of node def
#ndebug
# with statelite we need to set up both primary and backup SNs
# see which one we are and set the correct server
my $xmast;
my ($sn1, $sn2) = split(/,/, $nodehash{$node}{servicenode});
# if I'm the primary SN then just use the
# the xcatmaster value.
if ($sn1) {
if (xCAT::InstUtils->is_me($sn1)) {
$xmast = $nodehash{$node}{xcatmaster};
}
}
# if I'm the backup SN then figure out which interface
# to use for the node server name (ie. xcatmaster value)
if ($sn2) {
if (xCAT::InstUtils->is_me($sn2)) {
foreach my $int (@myIPs) {
if ( xCAT::NetworkUtils->ishostinsubnet($int, $nethash{$node}{mask}, $nethash{$node}{net} )) {
$xmast = xCAT::NetworkUtils->gethostname($int);
last;
}
}
}
}
my $server;
if ($nodehash{$node}{xcatmaster}) {
$server=$nodehash{$node}{xcatmaster};
} else {
$server=$nimprime;
}
if ($xmast) {
$server=$xmast;
} else {
$server=$nimprime;
}
my $n = xCAT::NetworkUtils->getipaddr($server);
chomp $n;