svn commit: r964495 - in /incubator/vcl/trunk/managementnode: etc/vcl/vcld.conf lib/VCL/utils.pm

[fapeeler]

Author: fapeeler
Date: Thu Jul 15 17:10:07 2010
New Revision: 964495

URL: http://svn.apache.org/viewvc?rev=964495&view=rev
Log:
VCL-163,VCL-224

Removed THROTTLE from conf and utils.pm

Modified:
    incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf
    incubator/vcl/trunk/managementnode/lib/VCL/utils.pm

Modified: incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf?rev=964495&r1=964494&r2=964495&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf (original)
+++ incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf Thu Jul 15 17:10:07 
2010
@@ -188,11 +188,6 @@ XCAT=yes
 
 LINUXIMAGEid=image
 
-#throttle - to limit the number concurrent bare metal loads
-# 0 or commeted out - disabled - no limit
-# any number 1 or more - number of simultanous loads
-THROTTLE=0
-
 # XCATROOT - root files for xcat, default is /opt/xcat
 XCATROOT=/opt/xcat
 

Modified: incubator/vcl/trunk/managementnode/lib/VCL/utils.pm
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/utils.pm?rev=964495&r1=964494&r2=964495&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/utils.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/utils.pm Thu Jul 15 17:10:07 2010
@@ -230,7 +230,6 @@ our @EXPORT = qw(
   $SERVER
   $SETUP_MODE
   $SYSADMIN
-  $THROTTLE
   $TOOLS
   $VERBOSE
   $VMWAREREPOSITORY
@@ -258,7 +257,7 @@ INIT {
        our ($FQDN)     = 0;
        our ($MYSQL_SSL,       $MYSQL_SSL_CERT);
        our ($IPCONFIGURATION, $DNSserver, $GATEWAY, $NETMASK, $ETHDEVICE) = 0;
-       our ($LINUX_IMAGE,     $THROTTLE);
+       our ($LINUX_IMAGE);
        our ($VMWARETYPE, $VMWARE_DISK,$VMWARE_MAC_ETH0_GENERATED, 
$VMWARE_MAC_ETH1_GENERATED);
        our ($WINDOWS_ROOT_PASSWORD);
    our ($XMLRPC_USER, $XMLRPC_PASS, $XMLRPC_URL);
@@ -466,11 +465,6 @@ INIT {
                                $LINUX_IMAGE = $1;
                        }
 
-                       #throttle
-                       if ($l =~ /^THROTTLE=([0-9]*)/) {
-                               $THROTTLE = $1;
-                       }
-
                        #vmware settings
                        # localdisk
                        if ($l =~ /^VMWARE_DISK=(localdisk|networkdisk)/) {
@@ -515,10 +509,6 @@ INIT {
                $LOGFILE = "/var/log/$PROCESSNAME.log";
        }
 
-       if (!$THROTTLE) {
-               $THROTTLE = 0;
-       }
-
        if (!$WINDOWS_ROOT_PASSWORD) {
                $WINDOWS_ROOT_PASSWORD = "clOudy";
        }
@@ -588,7 +578,7 @@ our ($LOGFILE, $PIDFILE, $VCLDRPCQUERYKE
 our ($SERVER, $DATABASE, $WRTUSER, $WRTPASS);
 our ($MYSQL_SSL,       $MYSQL_SSL_CERT);
 our ($IPCONFIGURATION, $DNSserver, $GATEWAY, $NETMASK, $ETHDEVICE);
-our ($LINUX_IMAGE,     $THROTTLE);
+our ($LINUX_IMAGE);
 our ($FQDN);
 our ($VMWARE_DISK);
 our $XCATROOT           = "/opt/xcat";