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

-Fix bug where next-server guessing wasn't attempted in absence of a noderes table

Browse Source 
-Fix bug where nex-server guessing wasn't performing per hostname on multi-homed nodes


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@779 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2008-03-13 21:32:00 +00:00
parent f2abea460b
commit 0e74e0df3a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xCAT-server-2.0/lib/xcat/plugins/dhcp.pm
View File

@ -84,16 +84,14 @@ sub addnode {
my $ent;
my $nrtab = xCAT::Table->new('noderes');
my $lstatements = $statements;
my $guess_next_server=0;
if ($nrtab) {
my $ent;
$ent = $nrtab->getNodeAttribs($node,['tftpserver']);
if ($ent and $ent->{tftpserver}) {
$lstatements = 'next-server '.inet_ntoa(inet_aton($ent->{tftpserver})).';'.$statements;
} else {
my $nxtsrv = xCAT::Utils->my_ip_facing($node);
if ($nxtsrv) {
$lstatements = "next-server $nxtsrv;$statements";
}
$guess_next_server=1;
}
#else {
# $ent = $nrtab->getNodeAttribs($node,['servicenode']);
@ -101,6 +99,8 @@ sub addnode {
# $statements = 'next-server = \"'.inet_ntoa(inet_aton($ent->{servicenode})).'\";'.$statements;
# }
#}
} else {
$guess_next_server=1;
}
my $mactab = xCAT::Table->new('mac');
unless ($mactab) {
@ -126,6 +126,12 @@ sub addnode {
return;
}
my $ip = inet_ntoa(inet_aton($hname));;
if ($guess_next_server) {
my $nxtsrv = xCAT::Utils->my_ip_facing($hname);
if ($nxtsrv) {
$lstatements = "next-server $nxtsrv;$statements";
}
}
syslog("local4|err","Setting $node ($hname|$ip) to ".$mac);
print $omshell "new host\n";
print $omshell "set name = \"$hname\"\n"; #Find and destroy conflict name