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

Fix blade to once again work correctly with bladecenter

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@16188 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2013-05-06 15:25:50 +00:00
parent d3f9b881f5
commit f6907796af
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -428,10 +428,10 @@ sub eventlog { #Tried various optimizations, but MM seems not to do bulk-request
my $matchstring;
if ($slot > 0) {
#$matchstring=sprintf("BLADE_%02d",$slot);
$matchstring=sprintf("NODE_%02d",$slot);
$matchstring=sprintf("(NODE_%02d|BLADE_%02d)",$slot,$slot);
} else {
#$matchstring="^(?!BLADE).*";
$matchstring="^(?!NODE).*";
$matchstring="^(?!(NODE|BLADE)).*";
}
if ($source =~ m/$matchstring$/i) { #MM guys changed their minds on capitalization
if (defined($order)) {
@ -446,7 +446,7 @@ sub eventlog { #Tried various optimizations, but MM seems not to do bulk-request
} else {
foreach (@moreslots) {
#$matchstring=sprintf("BLADE_%02d",$_);
$matchstring=sprintf("NODE_%02d",$_);
$matchstring=sprintf("(NODE_%02d|BLADE_%02d",$_,$_);
if ($source =~ m/$matchstring$/i) { #MM guys changed their minds on capitalization
if (defined($order)) {
$numentries++;