X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=slivermanager.py;h=287ee07601cbcc2413aacaa3af60eeb9ebe5d5c7;hb=4885d1e14fa561693476761056dcb1ae9c30be7d;hp=ce1f255bb8a517c3797456cbd997ebb167b303f9;hpb=0d641521588473a60d835b8b13a9567f6d49effc;p=nodemanager.git

diff --git a/slivermanager.py b/slivermanager.py
index ce1f255..287ee07 100644
--- a/slivermanager.py
+++ b/slivermanager.py
@@ -29,12 +29,9 @@ except:
     sliver_class_to_register = sliver_vs.Sliver_VS
     sliver_password_shell = sliver_vs.Sliver_VS.SHELL
 
-# temporary - hopefully bwlimit will be packaged separately and there will be no need to do this any longer
-try: 
-    from bwlimitlxc import bwmin, bwmax
-except: 
-    try : from bwlimit import bwmin, bwmax
-    except: bwmin, bwmax = 8, 1000*1000*1000
+# just being safe
+try : from plnode.bwlimit import bwmin, bwmax
+except: bwmin, bwmax = 8, 1000*1000*1000
 
 priority=10
 
@@ -45,6 +42,7 @@ DEFAULT_ALLOCATION = {
     'cpu_pct': 0, # percent CPU reserved
     'cpu_share': 1, # proportional share
     'cpu_cores': "0b", # reserved cpu cores <num_cores>[b]
+    'cpu_freezable': 0, # freeze processes if cpu_cores is 0
     # bandwidth parameters
     'net_min_rate': bwmin / 1000, # kbps
     'net_max_rate': bwmax / 1000, # kbps