svn commit: r1346920 - in /incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning: xCAT.pm xCAT2.pm xCAT21.pm

[fapeeler]

Author: fapeeler
Date: Wed Jun  6 14:42:12 2012
New Revision: 1346920

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

removed tftpd checks from xcat modules.

This service seems to be changing with different versions of xcat.


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=1346920&r1=1346919&r2=1346920&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm 
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm Wed 
Jun  6 14:42:12 2012
@@ -220,11 +220,6 @@ sub load {
                return 0;
        }
 
-       # Make sure atftpd is started on management node
-       if (!(_checknstartservice("atftpd"))) {
-               notify($ERRORS{'CRITICAL'}, 0, "atftpd is not running or failed 
to restart");
-               return 0;
-       }
        
        # Make sure the image repository path can be retrieved and directory 
exists
        my $image_repository_path = $self->_get_image_repository_path();

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=1346920&r1=1346919&r2=1346920&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm 
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm Wed 
Jun  6 14:42:12 2012
@@ -238,10 +238,6 @@ sub load {
        if (!(_checknstartservice("xcatd"))) {
                notify($ERRORS{'CRITICAL'}, 0, "xcatd is not running or failed 
to restart");
        }
-       # Make sure atftpd is started on management node
-       if (!(_checknstartservice("tftpd"))) {
-               notify($ERRORS{'CRITICAL'}, 0, "atftpd is not running or failed 
to restart");
-       }
 
        # Insert a computerloadlog record and edit nodetype table
        insertloadlog($reservation_id, $computer_id, "editnodetype", "updating 
nodetype table");

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=1346920&r1=1346919&r2=1346920&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT21.pm 
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT21.pm 
Wed Jun  6 14:42:12 2012
@@ -218,10 +218,6 @@ sub load {
        if (!(_checknstartservice("xcatd"))) {
                notify($ERRORS{'CRITICAL'}, 0, "xcatd is not running or failed 
to restart");
        }
-       # Make sure atftpd is started on management node
-       if (!(_checknstartservice("tftpd"))) {
-               notify($ERRORS{'CRITICAL'}, 0, "atftpd is not running or failed 
to restart");
-       }
 
        # Insert a computerloadlog record and edit nodetype table
        insertloadlog($reservation_id, $computer_id, "editnodetype", "updating 
nodetype table");