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

defect 4147 - allow nodeset to continue if prescript errors

Browse Source
This commit is contained in:
mellor
2014-06-03 14:15:26 -04:00
parent 7a5fa1df0e
commit 899cb5028d
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -414,9 +414,8 @@ sub process_request {
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running begin prescripts\n";
$rsp->{error}->[0]="Failed in running begin prescripts. Processing will still continue.\n";
$::PXE_callback->($rsp);
return;
}
}
@@ -577,9 +576,8 @@ sub process_request {
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running end prescripts\n";
$rsp->{error}->[0]="Failed in running end prescripts. Processing will still continue.\n";
$::PXE_callback->($rsp);
return;
}
}

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

@@ -349,9 +349,8 @@ sub process_request {
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running begin prescripts\n";
$rsp->{error}->[0]="Failed in running begin prescripts. Processing will still continue.\n";
$::VSMPPXE_callback->($rsp);
return;
}
}
@@ -466,9 +465,8 @@ sub process_request {
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running end prescripts\n";
$rsp->{error}->[0]="Failed in running end prescripts. Processing will still continue.\n";
$::VSMPPXE_callback->($rsp);
return;
}
}

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

@@ -435,9 +435,8 @@ sub process_request {
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running begin prescripts.\n";
$rsp->{error}->[0]="Failed in running begin prescripts. Processing will still continue.\n";
$::XNBA_callback->($rsp);
return;
}
}
@@ -564,9 +563,8 @@ sub process_request {
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running end prescripts.\n";
$rsp->{error}->[0]="Failed in running end prescripts. Processing will still continue.\n";
$::XNBA_callback->($rsp);
return;
}
}

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

@@ -469,9 +469,8 @@ sub process_request {
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running begin prescripts.\n";
$rsp->{error}->[0]="Failed in running begin prescripts. Processing will still continue.\n";
$::YABOOT_callback->($rsp);
return;
}
}
@@ -726,9 +725,14 @@ sub process_request {
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
<<<<<<< HEAD
$rsp->{error}->[0]="Failed in running end prescripts\n";
$::YABOOT_callback->($rsp);
return;
=======
$rsp->{error}->[0]="Failed in running end prescripts. Processing will still continue.\n";
$callback->($rsp);
>>>>>>> 78b8d21... defect 4147 - allow nodeset to continue if prescript errors
}
}
}