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

add hfi support in dhcp and running on rhel6

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8390 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz
2010-12-13 07:33:33 +00:00
parent f159080112
commit 57899c99ea
2 changed files with 64 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-server/lib/xcat/plugins/anaconda.pm
View File

@@ -587,6 +587,12 @@ sub mknetboot
$kcmdline .= "BOOTIF=" . $mac . " ";
}
}
if ( grep /hf/, $reshash->{$node}->[0]->{installnic} )
{
$kcmdline .= "rdloaddriver=hf_if ";
}
if (defined $sent->{serialport})
{

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

@@ -462,14 +462,14 @@ sub preprocess_request
}
if(grep /-h/,@{$req->{arg}}) {
my $usage="Usage: makedhcp -n\n\tmakedhcp -a\n\tmakedhcp -a -d\n\tmakedhcp -d noderange\n\tmakedhcp <noderange> [-s statements]\n\tmakedhcp [-h|--help]";
my $usage="Usage: makedhcp -n\n\tmakedhcp -a\n\tmakedhcp -a -d\n\tmakedhcp -d noderange\n\tmakedhcp <noderange> [-s statements] [--HFI]\n\tmakedhcp [-h|--help]";
$callback->({data => [$usage]});
return;
}
unless (($req->{arg} and (@{$req->{arg}}>0)) or $req->{node})
{
my $usage="Usage: makedhcp -n\n\tmakedhcp -a\n\tmakedhcp -a -d\n\tmakedhcp -d noderange\n\tmakedhcp <noderange> [-s statements]\n\tmakedhcp [-h|--help]";
my $usage="Usage: makedhcp -n\n\tmakedhcp -a\n\tmakedhcp -a -d\n\tmakedhcp -d noderange\n\tmakedhcp <noderange> [-s statements] [--HFI]\n\tmakedhcp [-h|--help]";
$callback->({data => [$usage]});
return;
}
@@ -946,6 +946,62 @@ sub process_request
}
}
close($omshell) if ($^O ne 'aix');
foreach my $node (@{$req->{node}})
{
unless ($machash)
{
$callback->(
{
error => ["Unable to open mac table, it may not exist yet"],
errorcode => [1]
}
);
return;
}
my $ent = $machash->{$node}->[0]; #tab->getNodeAttribs($node, [qw(mac)]);
unless ($ent and $ent->{mac})
{
$callback->(
{
error => ["Unable to find mac address for $node"],
errorcode => [1]
}
);
next;
}
my $mac = $ent->{mac};
# Workarounds for HFI devices, omshell doesn't support HFI device type, we cannot set hfi as hardware type in dhcp lease-file.
# Replace the ethernet with hfi in lease-file if --HFI is specified.
# After omshell supports HFI devices, remove these code and add correct hardware type from omshell
if ( grep /^--HFI$/, @{$req->{arg}} )
{
unless ( open( HOSTS,"</var/lib/dhcpd/dhcpd.leases" ))
{
next;
}
my @rawdata = <HOSTS>;
my @newdata = ();
close( HOSTS );
chomp @rawdata;
foreach my $line ( @rawdata ) {
if ( $line =~ /^(.*)ethernet $mac(.*)$/ ) {
push @newdata, "$1hfi $mac$2";
} else {
push @newdata, $line;
}
}
unless ( open( HOSTS,">/var/lib/dhcpd/dhcpd.leases" )) {
next;
}
for my $line (@newdata)
{
print HOSTS "$line\n";
}
close( HOSTS );
}
}
}
writeout();
if ($restartdhcp) {