Author: fapeeler
Date: Fri Jun 15 18:59:36 2012
New Revision: 1350738

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

small fix in regex for older xcat modules


Modified:
    incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
    incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT21.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=1350738&r1=1350737&r2=1350738&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm 
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm Fri 
Jun 15 18:59:36 2012
@@ -447,14 +447,14 @@ sub load {
                                notify($ERRORS{'OK'}, 0, "$computer_node_name 
ROUND 1 checks loop $sloop of 45");
                                while (<TAIL>) {
                                        if (!$s1) {
-                                               if ($_ =~ /dhcpd: DHCPDISCOVER 
from $eth0MACaddress/) {
+                                               if ($_ =~ /dhcpd: DHCPDISCOVER 
from $eth0MACaddress/i) {
                                                        $s1 = 1;
                                                        notify($ERRORS{'OK'}, 
0, "$computer_node_name STAGE 1 set DHCPDISCOVER from $eth0MACaddress");
                                                        
insertloadlog($reservation_id, $computer_id, "xcatstage1", "SUCCESS stage1 
detected dhcp request for node");
                                                }
                                        }
                                        if (!$s2) {
-                                               if ($_ =~ /dhcpd: DHCPACK on 
$privateIP to $eth0MACaddress/) {
+                                               if ($_ =~ /dhcpd: DHCPACK on 
$privateIP to $eth0MACaddress/i) {
                                                        $s2 = 1;
                                                        notify($ERRORS{'OK'}, 
0, "$computer_node_name  STAGE 2 set DHCPACK on $privateIP to $eth0MACaddress");
                                                        
insertloadlog($reservation_id, $computer_id, "xcatstage2", "SUCCESS stage2 
detected dhcp ack for node");

Modified: 
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT21.pm
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT21.pm?rev=1350738&r1=1350737&r2=1350738&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT21.pm 
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT21.pm 
Fri Jun 15 18:59:36 2012
@@ -479,14 +479,14 @@ sub load {
                                notify($ERRORS{'OK'}, 0, "$computer_node_name 
ROUND 1 checks loop $sloop of $maxloops");
                                while (<TAIL>) {
                                        if (!$s1) {
-                                               if ($_ =~ /dhcpd: DHCPDISCOVER 
from $eth0MACaddress/) {
+                                               if ($_ =~ /dhcpd: DHCPDISCOVER 
from $eth0MACaddress/i) {
                                                        $s1 = 1;
                                                        notify($ERRORS{'OK'}, 
0, "$computer_node_name STAGE 1 set DHCPDISCOVER from $eth0MACaddress");
                                                        
insertloadlog($reservation_id, $computer_id, "xcatstage1", "SUCCESS stage1 
detected dhcp request for node");
                                                }
                                        }
                                        if (!$s2) {
-                                               if ($_ =~ /dhcpd: DHCPACK on 
$computer_private_ip_address to $eth0MACaddress/) {
+                                               if ($_ =~ /dhcpd: DHCPACK on 
$computer_private_ip_address to $eth0MACaddress/i) {
                                                        $s2 = 1;
                                                        notify($ERRORS{'OK'}, 
0, "$computer_node_name  STAGE 2 set DHCPACK on $computer_private_ip_address to 
$eth0MACaddress");
                                                        
insertloadlog($reservation_id, $computer_id, "xcatstage2", "SUCCESS stage2 
detected dhcp ack for node");


Reply via email to