X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_vs.py;h=4c084b97a3b424a667b2f3948198072ff2c255d4;hb=4b8b65f7efb0a8bfdbf7c236f4cbe628a0171158;hp=a151bfe06df12b956a1fb3af33e682c729342063;hpb=7167037aed08b03d5c08335fa2347b042c68c5d0;p=nodemanager.git

diff --git a/sliver_vs.py b/sliver_vs.py
index a151bfe..4c084b9 100644
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -196,7 +196,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
     def is_running(self):
         return vserver.VServer.is_running(self)
 
-    def set_resources(self,setup=False):
+    def set_resources(self):
         disk_max = self.rspec['disk_max']
         logger.log('sliver_vs: %s: setting max disk usage to %d KiB' % (self.name, disk_max))
         try:  # if the sliver is over quota, .set_disk_limit will throw an exception
@@ -233,30 +233,29 @@ class Sliver_VS(accounts.Account, vserver.VServer):
         cpu_pct = self.rspec['cpu_pct']
         cpu_share = self.rspec['cpu_share']
 
-        if setup:
-            count = 1
-            for key in self.rspec.keys():
-                if key.find('sysctl.') == 0:
-                    sysctl=key.split('.')
+        count = 1
+        for key in self.rspec.keys():
+            if key.find('sysctl.') == 0:
+                sysctl=key.split('.')
+                try:
+                    # /etc/vservers/<guest>/sysctl/<id>/
+                    dirname = "/etc/vservers/%s/sysctl/%s" % (self.name, count)
                     try:
-                        # /etc/vservers/<guest>/sysctl/<id>/
-                        dirname = "/etc/vservers/%s/sysctl/%s" % (self.name, count)
-                        try:
-                            os.makedirs(dirname, 0755)
-                        except:
-                            pass
-                        setting = open("%s/setting" % dirname, "w")
-                        setting.write("%s\n" % key.lstrip("sysctl."))
-                        setting.close()
-                        value = open("%s/value" % dirname, "w")
-                        value.write("%s\n" % self.rspec[key])
-                        value.close()
-                        count += 1
-
-                        logger.log("sliver_vs: %s: writing %s=%s"%(self.name,key,self.rspec[key]))
-                    except IOError, e:
-                        logger.log("sliver_vs: %s: could not set %s=%s"%(self.name,key,self.rspec[key]))
-                        logger.log("sliver_vs: %s: error = %s"%(self.name,e))
+                        os.makedirs(dirname, 0755)
+                    except:
+                        pass
+                    setting = open("%s/setting" % dirname, "w")
+                    setting.write("%s\n" % key.lstrip("sysctl."))
+                    setting.close()
+                    value = open("%s/value" % dirname, "w")
+                    value.write("%s\n" % self.rspec[key])
+                    value.close()
+                    count += 1
+
+                    logger.log("sliver_vs: %s: writing %s=%s"%(self.name,key,self.rspec[key]))
+                except IOError, e:
+                    logger.log("sliver_vs: %s: could not set %s=%s"%(self.name,key,self.rspec[key]))
+                    logger.log("sliver_vs: %s: error = %s"%(self.name,e))
 
 
         if self.rspec['enabled'] > 0: