X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_vs.py;h=09cf5b259d22ce03ddd437e75588a21e9a345778;hb=e9bcfa27a1da64878f80b8b010d3f8ae71194992;hp=ad37e3ed9e043003d25e5d599aa9b174084b789e;hpb=1b64fd5ba728875d918f80a79406ea7851de464d;p=nodemanager.git diff --git a/sliver_vs.py b/sliver_vs.py index ad37e3e..09cf5b2 100644 --- a/sliver_vs.py +++ b/sliver_vs.py @@ -142,7 +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']) self.set_capabilities_config(self.rspec['capabilities']) if self.rspec['capabilities']: logger.log('%s: setting capabilities to %s' % (self.name, self.rspec['capabilities'])) @@ -162,7 +161,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)