Removed white list. Bumped version 1.5.3

[nodemanager.git] / sliver_vs.py

diff --git a/sliver_vs.py b/sliver_vs.py
index db1d340..9b9442d 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -142,8 +142,6 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             hard = self.rspec['%s_hard'%type]
             self.set_rlimit_config(limit, hard, soft, minimum)
 
-        self.set_WHITELISTED_config(self.rspec['whitelist'])
-
         if False: # this code was commented out before
             # N.B. net_*_rate are in kbps because of XML-RPC maxint
             # limitations, convert to bps which is what bwlimit.py expects.
@@ -159,7 +157,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
         cpu_min = self.rspec['cpu_min']
         cpu_share = self.rspec['cpu_share']
 
-        if self.rspec['enabled'] > 0 and self.rspec['whitelist'] == 1:
+        if self.rspec['enabled'] > 0:
             if cpu_min >= 50:  # at least 5%: keep people from shooting themselves in the foot
                 logger.log('%s: setting cpu share to %d%% guaranteed' % (self.name, cpu_min/10.0))
                 self.set_sched_config(cpu_min, vserver.SCHED_CPU_GUARANTEED)