Author: fapeeler
Date: Thu Oct 25 19:29:57 2012
New Revision: 1402286
URL: http://svn.apache.org/viewvc?rev=1402286&view=rev
Log:
VCL-630
Minor tweaks
Modified:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning.pm
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/xCAT21.pm
Modified:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning.pm
URL:
http://svn.apache.org/viewvc/vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning.pm?rev=1402286&r1=1402285&r2=1402286&view=diff
==============================================================================
--- vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning.pm
(original)
+++ vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning.pm
Thu Oct 25 19:29:57 2012
@@ -195,11 +195,11 @@ sub node_status {
}
#elsif ($current_image_name eq $image_name) {
elsif ($current_image_revision_id eq $imagerevision_id) {
- notify($ERRORS{'DEBUG'}, 0, "currentimage.txt image
($current_image_revision_id) matches requested image $imagerevision_id
($image_name) on $computer_name");
+ notify($ERRORS{'DEBUG'}, 0, "currentimage.txt image
$current_image_revision_id ($status->{currentimage}) matches requested image
$imagerevision_id ($image_name) on $computer_name");
$status->{image_match} = 1;
}
else {
- notify($ERRORS{'OK'}, 0, "currentimage.txt image
($current_image_revision_id) does not match requested image name
$imagerevision_id ($image_name) on $computer_name, returning 'RELOAD'");
+ notify($ERRORS{'OK'}, 0, "currentimage.txt image
$current_image_revision_id ($status->{currentimage}) does not match requested
image name $imagerevision_id ($image_name) on $computer_name, returning
'RELOAD'");
return $status;
}
Modified:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
URL:
http://svn.apache.org/viewvc/vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/xCAT.pm?rev=1402286&r1=1402285&r2=1402286&view=diff
==============================================================================
---
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
(original)
+++
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
Thu Oct 25 19:29:57 2012
@@ -2203,6 +2203,8 @@ sub node_status {
} ## end if ($sshd_status =~ /on/)
else {
$status{ssh} = 0;
+ $status{status} = 'RELOAD';
+ return \%status;
}
notify($ERRORS{'OK'}, $log, "$computer_short_name sshd status:
$sshd_status ($status{ssh})");
Modified:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm
URL:
http://svn.apache.org/viewvc/vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm?rev=1402286&r1=1402285&r2=1402286&view=diff
==============================================================================
---
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm
(original)
+++
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm
Thu Oct 25 19:29:57 2012
@@ -1812,6 +1812,7 @@ sub node_status {
}
else {
$status{rpower} = 0;
+
}
notify($ERRORS{'OK'}, $log, "$computer_short_name rpower status:
$rpower_status ($status{rpower})");
@@ -1843,6 +1844,8 @@ sub node_status {
} ## end if ($sshd_status =~ /on/)
else {
$status{ssh} = 0;
+ $status{status} = 'RELOAD';
+ return \%status;
}
notify($ERRORS{'OK'}, $log, "$computer_short_name sshd status:
$sshd_status ($status{ssh})");
Modified:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/xCAT21.pm
URL:
http://svn.apache.org/viewvc/vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/xCAT21.pm?rev=1402286&r1=1402285&r2=1402286&view=diff
==============================================================================
---
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/xCAT21.pm
(original)
+++
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/xCAT21.pm
Thu Oct 25 19:29:57 2012
@@ -1827,6 +1827,8 @@ sub node_status {
} ## end if ($sshd_status =~ /on/)
else {
$status{ssh} = 0;
+ $status{status} = 'RELOAD';
+ return \%status;
}
notify($ERRORS{'OK'}, $log, "$computer_short_name sshd status:
$sshd_status ($status{ssh})");
