svn commit: r1520593 - /vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm

[dimach]

Author: dimach
Date: Fri Sep  6 15:21:00 2013
New Revision: 1520593

URL: http://svn.apache.org/r1520593
Log:
VCL-722: changes to Linux.pm and Windows.pm to send shutdown via ONE controller 
- reverted to original state, will use one->power_off to power off

Modified:
    vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm

Modified: vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm
URL: 
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm?rev=1520593&r1=1520592&r2=1520593&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm Fri Sep  6 15:21:00 2013
@@ -2265,20 +2265,6 @@ sub shutdown {
                notify($ERRORS{'DEBUG'}, 0, "shutting down $computer_node_name 
and NOT waiting for power off");
        }
        
-       # If computer is on ONE cloud, shutdown via ONE controls:
-       
-       if ($self->provisioner->can("opennebula")) {
-               if(!$self->provisioner->power_off()) {
-                       notify($ERRORS{'CRITICAL'}, 0, "Couldn't shutdown 
$computer_node_name with provisioner->power_off()");
-                       return 0;
-               } 
-               else {
-                       notify($ERRORS{'DEBUG'}, 0, "Powered off computer 
$computer_node_name via provisioning module");
-                       return 1;
-               }
-       }
-       ######################################################
-       
        # Check if computer responds to ssh before preparing for shut down
        if ($self->wait_for_ssh(0)) {
                my $command = '/sbin/shutdown -h now';