From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Thu, 20 Jan 2011 23:17:53 +0000 (-0500)
Subject: remove setup parameter as no one uses it
X-Git-Tag: nodemanager-1.8-34~2
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=da3058ad1667905cbcdd803a92a1326aceb48065

remove setup parameter as no one uses it
---

diff --git a/sliver_vs.py b/sliver_vs.py
index 919fe3f..7ee1825 100644
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -220,7 +220,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('%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
@@ -257,30 +257,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: