X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_vs.py;h=82523a5aa9eabb05f5abd4bfadeac2378584ecad;hb=36705eec0c8906788f81b95fc2bf4922f1d39b9a;hp=5573984f89c93edc7330a518a5bd39912e37c00b;hpb=75db8a1a1e14adc7715c452fab87e45f942d425b;p=nodemanager.git diff --git a/sliver_vs.py b/sliver_vs.py index 5573984..82523a5 100644 --- a/sliver_vs.py +++ b/sliver_vs.py @@ -68,6 +68,7 @@ class Sliver_VS(accounts.Account, vserver.VServer): self.slice_id = rec['slice_id'] self.disk_usage_initialized = False self.initscriptchanged = False + self.enabled = True self.configure(rec) @staticmethod @@ -93,7 +94,7 @@ class Sliver_VS(accounts.Account, vserver.VServer): (pldistro,fcdistro,arch) = default.split("-") known_archs = [ 'i386', 'x86_64' ] - known_fcdistros = [ 'f8', 'f9', 'centos5' ] + known_fcdistros = [ 'centos5', 'f8', 'f9', 'f10', 'f11', 'f12' ] # from the slice attribute: cut dashes and try to figure the meaning slice_wishes = vref.split("-") for wish in slice_wishes: @@ -267,6 +268,10 @@ class Sliver_VS(accounts.Account, vserver.VServer): if self.is_running(): logger.log("%s: Setting name to %s" % (self.name, self.slice_id),2) self.setname(self.slice_id) + + if self.enabled == False: + self.enabled = True + self.start() if False: # Does not work properly yet. if self.have_limits_changed(): @@ -282,4 +287,5 @@ class Sliver_VS(accounts.Account, vserver.VServer): else: # tell vsh to disable remote login by setting CPULIMIT to 0 logger.log('%s: disabling remote login' % self.name) self.set_sched_config(0, 0) + self.enabled = False self.stop()