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

Have dhcp set next-server as appropriate when noderes indicates on a per-node basis

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@336 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2008-01-28 14:07:33 +00:00
parent f69c8fbda1
commit 5d884bd8b2
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,11 +81,28 @@ sub addnode {
#up the lease file the way we would want anyway.
my $node = shift;
my $ent;
my $nrtab = xCAT::Table->new('noderes');
if ($nrtab) {
my $ent;
$ent = $nrtab->getNodeAttribs($node,['tftpserver']);
if ($ent and $ent->{tftpserver}) {
$statements = 'next-server = \"'.inet_ntoa(inet_aton($ent->{tftpserver})).'";'.$statements;
} else {
$ent = $nrtab->getNodeAttribs($node,['servicenode']);
if ($ent and $ent->{servicenode}) {
$statements = 'next-server = \"'.inet_ntoa(inet_aton($ent->{servicenode})).'\";'.$statements;
}
}
}
my $mactab = xCAT::Table->new('mac');
unless ($mactab) { return; } #TODO: report error sanely
unless ($mactab) {
$callback->({error=>["Unable to open mac table, it may not exist yet"],errorcode=>[1]});
return;
}
$ent = $mactab->getNodeAttribs($node,[qw(mac)]);
unless ($ent and $ent->{mac}) {
return; #TODO: sane error
$callback->({error=>["Unable to find mac address for $node"],errorcode=>[1]});
return;
}
my @macs = split(/\|/,$ent->{mac});
my $mace;
@ -125,6 +142,7 @@ sub addnode {
if ($statements) {
print $omshell "set statements = \"$statements\"\n";
}
print $omshell "create\n";
print $omshell "close\n";
unless (grep /#definition for host $node aka host $hname/,@dhcpconf) {