X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_vs.py;h=0624d067f66971fc8bf462db40a506c24b094cab;hb=89202d986138aa48f674eddea5a88794f4ba0f6e;hp=bf99cecbd5c8368133b4627c5b60ad5b8ee4fe23;hpb=08d71ce9b241ecd0ca67f0fb634fc9cfb26405dc;p=nodemanager.git diff --git a/sliver_vs.py b/sliver_vs.py index bf99cec..0624d06 100644 --- a/sliver_vs.py +++ b/sliver_vs.py @@ -125,6 +125,9 @@ class Sliver_VS(accounts.Account, vserver.VServer): logger.log_call(['/bin/bash','-x','/usr/sbin/vuserdel', name, ]) def configure(self, rec): + # in case we update nodemanager.. + self.install_and_enable_vinit() + new_rspec = rec['_rspec'] if new_rspec != self.rspec: self.rspec = new_rspec @@ -160,8 +163,7 @@ class Sliver_VS(accounts.Account, vserver.VServer): logger.log_exc("vsliver_vs: %s: failed to create runlevel3 symlink %s"%rc3_link) def rerun_slice_vinit(self): - command = "/usr/sbin/vserver %s exec /etc/rc.d/init.d/vinit.slice restart %s" % (self.name, self.name) - + command = "/usr/sbin/vserver %s exec /etc/rc.d/init.d/vinit restart" % (self.name) logger.log("vsliver_vs: %s: Rerunning slice initscript: %s" % (self.name, command)) subprocess.call(command + "&", stdin=open('/dev/null', 'r'), stdout=open('/dev/null', 'w'), stderr=subprocess.STDOUT, shell=True)