svn commit: r980195 - /incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm

[fapeeler]

Author: fapeeler
Date: Wed Jul 28 20:26:08 2010
New Revision: 980195

URL: http://svn.apache.org/viewvc?rev=980195&view=rev
Log:
VCL-239

Added additional check to use nodeset nodename stat command to determine if 
installing or not

Modified:
    incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm

Modified: 
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm?rev=980195&r1=980194&r2=980195&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm 
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm Wed 
Jul 28 20:26:08 2010
@@ -623,10 +623,12 @@ sub load {
                        }
                } ## end if (!$s1)
                if ($s1 && !$s2) {
-                       if ($status =~ /installing|unknown/){
-                               notify($ERRORS{'OK'}, 0, "$computer_node_name 
is still installing: $status");
+                       my $nodeset_status = 
_nodeset_option($computer_node_name, "stat");
+                       if ($status =~ /installing|unknown/ || $nodeset_status 
=~ /install/){
+                               notify($ERRORS{'OK'}, 0, "$computer_node_name 
is still installing, nodestat: $status");
                        }
-                       if ($status =~ /ping boot|noping/ || $status =~ 
/partimage-ng: complete/) {
+                       
+                       if ($nodeset_status =~ /boot/ || $status =~ 
/partimage-ng: complete/) {
                                notify($ERRORS{'OK'}, 0, "$computer_node_name 
is finished installing: $status");
                                insertloadlog($reservation_id, $computer_id, 
"bootstate", "node in boot state completed imaging process - proceeding to next 
round");
                                $s2 = 2;