Author: fapeeler
Date: Tue Jun 12 16:36:30 2012
New Revision: 1349426
URL: http://svn.apache.org/viewvc?rev=1349426&view=rev
Log:
VCL-594
xCAT modules where not detecting entries in /var/log/messages, so removed
stage3 and 4 checks.
Not any real good reason to make these checks other than debugging.
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.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=1349426&r1=1349425&r2=1349426&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm Tue
Jun 12 16:36:30 2012
@@ -460,29 +460,13 @@ sub load {
insertloadlog($reservation_id, $computer_id, "xcatstage2", "SUCCESS stage2
detected dhcp ack for node");
}
}
- if (!$s3) {
- if ($_ =~ /Serving
\/tftpboot\/pxelinux.0 to $privateIP:/) {
- $s3 = 1;
- chomp($_);
- notify($ERRORS{'OK'},
0, "$computer_node_name STAGE 3 set $_");
-
insertloadlog($reservation_id, $computer_id, "xcatstage3", "SUCCESS stage3 node
received pxe");
- }
- }
- if (!$s4) {
- if ($_ =~ /Serving
\/tftpboot\/xcat\/([.-_a-zA-Z0-9]*)\/x86\/install.gz to $privateIP:/ ||
- $_ =~ /authenticated
mount request from ($computer_node_name|$privateIP):(\d+) for/ ||
- $_ =~ /xcat: xcatd:
$computer_node_name installing/) {
- $s4 = 1;
- chomp($_);
- notify($ERRORS{'OK'},
0, "$computer_node_name STAGE 4 set $_");
-
insertloadlog($reservation_id, $computer_id, "xcatstage4", "SUCCESS stage4 node
received pxe install instructions");
- }
- }
} #while
#either stages are set or we loop or we
rinstall again
- if ($s4) {
+ if ($s2) {
notify($ERRORS{'OK'}, 0,
"$computer_node_name ROUND1 stages are set proceeding to next round");
close(TAIL);
+ #Pause here
+ sleep 30;
goto ROUND2;
}
elsif ($sloop > 45) {
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=1349426&r1=1349425&r2=1349426&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm Tue
Jun 12 16:36:30 2012
@@ -500,45 +500,29 @@ 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");
}
}
- if (!$s3) {
- if ($_ =~ /Serving pxelinux.0
to $computer_private_ip_address:/ ||
- $_ =~ /RRQ from
$computer_private_ip_address filename pxelinux.0/) {
- $s3 = 1;
- chomp($_);
- notify($ERRORS{'OK'},
0, "$computer_node_name STAGE 3 set $_");
-
insertloadlog($reservation_id, $computer_id, "xcatstage3", "SUCCESS stage3 node
received pxe");
- }
- }
- if (!$s4) {
- if ($_ =~ /Serving xcat\/.+ to
$computer_private_ip_address:/ ||
- $_ =~ /RRQ from
$computer_private_ip_address filename xcat\/.+/) {
- $s4 = 1;
- chomp($_);
- notify($ERRORS{'OK'},
0, "$computer_node_name STAGE 4 set $_");
-
insertloadlog($reservation_id, $computer_id, "xcatstage4", "SUCCESS stage4 node
received pxe install instructions");
- }
- }
} #while
#either stages are set or we loop or we
rinstall again
- if ($s4) {
+ if ($s2) {
notify($ERRORS{'OK'}, 0,
"$computer_node_name ROUND1 stages are set proceeding to next round");
close(TAIL);
+ #Pause before continuing
+ sleep 30;
goto ROUND2;
}
elsif ($sloop > $maxloops) {
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=1349426&r1=1349425&r2=1349426&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT21.pm
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT21.pm
Tue Jun 12 16:36:30 2012
@@ -492,53 +492,16 @@ sub load {
insertloadlog($reservation_id, $computer_id, "xcatstage2", "SUCCESS stage2
detected dhcp ack for node");
}
}
- if (!$s3) {
- if ($_ =~ /Serving pxelinux.0
to $computer_private_ip_address:/) {
- $s3 = 1;
- chomp($_);
- notify($ERRORS{'OK'},
0, "$computer_node_name STAGE 3 set $_");
-
insertloadlog($reservation_id, $computer_id, "xcatstage3", "SUCCESS stage3 node
received pxe");
- }
- }
- if (!$s4) {
- if ($_ =~ /Serving
xcat\/\w+\/x86(_64)?\/initrd.img to $computer_private_ip_address:/) {
- $s4 = 1;
- chomp($_);
- notify($ERRORS{'OK'},
0, "$computer_node_name STAGE 4 set $_");
-
insertloadlog($reservation_id, $computer_id, "xcatstage4", "SUCCESS stage4 node
received pxe install instructions");
- }
- }
-=pod
- #stage5 is where images and rhas(KS)
are different
- if (!$s5) {
- #here we look for rpc.mountd
- # TODO make sure s5 check is
right
- if ($_ =~ /authenticated mount
request from $computer_node_name:(\d+) for/) {
- $s5 = 1;
- chomp($_);
- notify($ERRORS{'OK'},
0, "$computer_node_name STAGE 5 set $_");
-
insertloadlog($reservation_id, $computer_id, "xcatstage5", "SUCCESS stage5 node
started installing via partimage");
- }
- #in case we miss the above
statement
- if ($image_os_type =~ /linux/i)
{
- # TODO make sure s5
check is right
- if ($_ =~ /xcat: xcatd:
$computer_node_name installing/) {
- $s5 = 1;
- chomp($_);
-
notify($ERRORS{'OK'}, 0, "$computer_node_name STAGE 5 set $_");
-
insertloadlog($reservation_id, $computer_id, "xcatstage5", "SUCCESS stage5 node
started installing via kickstart");
- }
- }
- } ## end if (!$s5)
-=cut
} #while
#either stages are set or we loop or we
rinstall again
#check s5 and counter for loop control
- if ($s4) {
+ if ($s2) {
notify($ERRORS{'OK'}, 0,
"$computer_node_name ROUND1 stages are set proceeding to next round");
close(TAIL);
+ #Pause here
+ sleep 30;
goto ROUND2;
}
elsif ($sloop > $maxloops) {
