From 899cb5028ddfa672e9af9ba884316072ef529048 Mon Sep 17 00:00:00 2001
From: mellor <mellor@us.ibm.com>
Date: Tue, 3 Jun 2014 14:15:26 -0400
Subject: [PATCH] defect 4147 - allow nodeset to continue if prescript errors
---
xCAT-server/lib/xcat/plugins/pxe.pm | 6 ++----
xCAT-server/lib/xcat/plugins/vsmppxe.pm | 6 ++----
xCAT-server/lib/xcat/plugins/xnba.pm | 6 ++----
xCAT-server/lib/xcat/plugins/yaboot.pm | 8 ++++++--
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/xCAT-server/lib/xcat/plugins/pxe.pm b/xCAT-server/lib/xcat/plugins/pxe.pm
index b9fbb2066..6a804d220 100644
--- a/xCAT-server/lib/xcat/plugins/pxe.pm
+++ b/xCAT-server/lib/xcat/plugins/pxe.pm
@@ -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;
}
}
diff --git a/xCAT-server/lib/xcat/plugins/vsmppxe.pm b/xCAT-server/lib/xcat/plugins/vsmppxe.pm
index 6e310fa7b..23457bd04 100644
--- a/xCAT-server/lib/xcat/plugins/vsmppxe.pm
+++ b/xCAT-server/lib/xcat/plugins/vsmppxe.pm
@@ -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;
}
}
diff --git a/xCAT-server/lib/xcat/plugins/xnba.pm b/xCAT-server/lib/xcat/plugins/xnba.pm
index 38e85fdbe..aee9ba9e1 100644
--- a/xCAT-server/lib/xcat/plugins/xnba.pm
+++ b/xCAT-server/lib/xcat/plugins/xnba.pm
@@ -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;
}
}
diff --git a/xCAT-server/lib/xcat/plugins/yaboot.pm b/xCAT-server/lib/xcat/plugins/yaboot.pm
index f76f29927..f77b86416 100644
--- a/xCAT-server/lib/xcat/plugins/yaboot.pm
+++ b/xCAT-server/lib/xcat/plugins/yaboot.pm
@@ -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
}
}
}