Author: arkurth
Date: Tue Oct  6 16:48:21 2009
New Revision: 822342

URL: http://svn.apache.org/viewvc?rev=822342&view=rev
Log:
VCL-246
Fixed bug in vmware.pm and xCAT.pm where it's checking for the READY flag 
during load. The regex was not tight enough. Processes which causes lines to be 
written to /var/log/messages with the word "ready" were throwing off the check.

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

Modified: 
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vmware.pm
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vmware.pm?rev=822342&r1=822341&r2=822342&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vmware.pm 
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vmware.pm 
Tue Oct  6 16:48:21 2009
@@ -919,7 +919,7 @@
                                                }
                                        }
                                        if (!$s5) {
-                                               if ($_ =~ /$computer_shortname 
(.*) READY/i) {
+                                               if ($_ =~ /$computer_shortname 
is READY\./) {
                                                        $s5 = 1;
                                                        notify($ERRORS{'OK'}, 
0, "$computer_shortname STAGE 5 set found READY flag");
                                                        
insertloadlog($reservation_id, $vmclient_computerid, "vmstage5", "detected 
READY flag proceeding to post configuration");

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=822342&r1=822341&r2=822342&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm 
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm Tue 
Oct  6 16:48:21 2009
@@ -687,7 +687,7 @@
                                for (;;) {
                                        notify($ERRORS{'OK'}, 0, 
"$computer_node_name checking for READY FLAG loop count is $readycount of 10");
                                        while (<TAIL>) {
-                                               if ($_ =~ /READY|ready|Starting 
firstboot:  succeeded/) {
+                                               if ($_ =~ /READY/) {
                                                        $ready = 1 if ($_ =~ 
/$computer_node_name/);
                                                }
                                                if ($image_os_type =~ /linux/i) 
{


Reply via email to