xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-01 17:17:36 +00:00
Code Issues Releases Wiki Activity

fix defect #4738 [fvt]2.10:nodeset still give error info if using wrong netboot mode

Browse Source
This commit is contained in:
immarvin
2015-07-09 23:00:23 -04:00
parent 39cf499532
commit 0d6189159d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -226,7 +226,7 @@ sub setdestiny {
my $netbootval=xCAT::Utils->lookupNetboot($ref->{osvers},$ref->{osarch},$ref->{imagetype});
unless($netbootval =~ /$curnetboot/i){
#$errored =1;
$callback->({warning=> [join(",",@{$req->{node}}).": $curnetboot is not valid when provisioning $target,valid options: \"$netbootval\". \nFor more details see the 'netboot' description in the output of \"tabdump -d noderes\"."]});
$callback->({warning=> [join(",",@{$req->{node}}).": $curnetboot might be invalid when provisioning $target,valid options: \"$netbootval\". \nFor more details see the 'netboot' description in the output of \"tabdump -d noderes\"."]});
#return;
}
@@ -313,8 +313,8 @@ sub setdestiny {
#if any node with inappropriate noderes.netboot,report the error and return
foreach my $tmpimage(keys %$invalidosimghash){
$errored =1;
$callback->({errorcode=>[1],error=> [join(",",@{$invalidosimghash->{$tmpimage}->{nodes}}).": $curnetboot is not valid when provisioning $tmpimage,valid options: \"$invalidosimghash->{$tmpimage}->{netboot}\". \nFor more details see the 'netboot' description in the output of \"tabdump -d noderes\"."]});
#$errored =1;
$callback->({warning=> [join(",",@{$invalidosimghash->{$tmpimage}->{nodes}}).": $curnetboot might be invalid when provisioning $tmpimage,valid options: \"$invalidosimghash->{$tmpimage}->{netboot}\". \nFor more details see the 'netboot' description in the output of \"tabdump -d noderes\"."]});
}
if("$errored" ne "0"){