Author: arkurth
Date: Wed Nov 17 18:39:45 2010
New Revision: 1036156
URL: http://svn.apache.org/viewvc?rev=1036156&view=rev
Log:
VCL-221
Added check to xCAT.pm::node_status() subroutine to check if post_load tasks
have run. If not, 'POST_LOAD' is returned instead of 'READY'.
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
Modified: incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm?rev=1036156&r1=1036155&r2=1036156&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm Wed
Nov 17 18:39:45 2010
@@ -2286,6 +2286,16 @@ sub node_status {
# Node is up and doesn't need to be reloaded
if ($status{status} =~ /ready/i) {
notify($ERRORS{'OK'}, $log, "node is up and does not need to be
reloaded");
+
+ # Check if the OS post_load tasks have run
+ if ($self->os->get_vcld_post_load_status()) {
+ notify($ERRORS{'DEBUG'}, 0, "OS module post_load tasks
have been completed on VM $computer_short_name");
+ $status{status} = 'READY';
+ }
+ else {
+ notify($ERRORS{'DEBUG'}, 0, "OS module post_load tasks
have not been completed on VM $computer_short_name, returning 'POST_LOAD'");
+ $status{status} = 'POST_LOAD';
+ }
}
else {
notify($ERRORS{'OK'}, $log, "node is either down or needs to be
reloaded");
