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

omapi now is supporting hfi hardware type. we direct set the hardware type from omapi instead of change the lease file manually.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9986 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz 2011-06-30 08:14:24 +00:00
parent c19622f0e9
commit d072b35c53
2 changed files with 27 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -301,6 +301,7 @@ sub addnode
my @macs = split(/\|/, $ent->{mac});
my $mace;
my $deflstaments=$lstatements;
my $count = 0;
foreach $mace (@macs)
{
$lstatements=$deflstaments; #force recalc on every entry
@ -384,11 +385,25 @@ sub addnode
$mac =~ s/(\w{2})/$1:/g;
$mac =~ s/:$//;
}
my $hostname = $hname;
my $hardwaretype = 1;
my %client_nethash = xCAT::DBobjUtils->getNetwkInfo( [$node] );
if ( $client_nethash{$node}{mgtifname} =~ /hf/ )
{
$hardwaretype = 37;
if ( scalar(@macs) > 1 ) {
if ( $hname !~ /^(.*)-hf(.*)$/ ) {
$hostname = $hname . "-hf" . $count;
} else {
$hostname = $1 . "-hf" . $count;
}
}
}
#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
"set name = \"$hostname\"\n"; #Find and destroy conflict name
print $omshell "open\n";
print $omshell "remove\n";
print $omshell "close\n";
@ -406,9 +421,9 @@ sub addnode
print $omshell "remove\n";
print $omshell "close\n";
print $omshell "new host\n";
print $omshell "set name = \"$hname\"\n";
print $omshell "set name = \"$hostname\"\n";
print $omshell "set hardware-address = " . $mac . "\n";
print $omshell "set hardware-type = 1\n";
print $omshell "set hardware-type = $hardwaretype\n";
if ($ip eq "DENIED")
{ #Blacklist this mac to preclude confusion, give best shot at things working
@ -431,12 +446,13 @@ sub addnode
print $omshell "create\n";
print $omshell "close\n";
unless (grep /#definition for host $node aka host $hname/, @dhcpconf)
unless (grep /#definition for host $node aka host $hostname/, @dhcpconf)
{
push @dhcpconf,
"#definition for host $node aka host $hname can be found in the dhcpd.leases file\n";
"#definition for host $node aka host $hostname can be found in the dhcpd.leases file\n";
}
}
$count = $count + 2;
}
}
@ -1274,39 +1290,6 @@ sub process_request
);
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.
# After omshell supports HFI devices, remove these code and add correct hardware type from omshell
my %client_nethash = xCAT::DBobjUtils->getNetwkInfo( [$node] );
if ( grep /hf/, $client_nethash{$node}{mgtifname} )
{
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();

7
xCAT-server/lib/xcat/plugins/yaboot.pm
View File

@ -106,7 +106,12 @@ sub setstate {
my $count = 0;
foreach my $mac (@macs) {
if ( $mac !~ /!(.*)/) {
my $hostname = $node . "-hf" . $count;
my $hostname;
if ( $node !~ /^(.*)-hf(.*)$/ ) {
$hostname = $node . "-hf" . $count;
} else {
$hostname = $1 . "-hf" . $count;
}
open($pcfg,'>',$tftpdir."/etc/".$hostname);
my $cref=$chainhash{$node}->[0]; #$chaintab->getNodeAttribs($node,['currstate']);
if ($cref->{currstate}) {