X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sliver_lxc.py;h=5892eed9fe6c5d9245ca550aa6fc38e1c0bb8a54;hb=ccc7b9c4b76a89faad66867b00d16ac45333b6de;hp=518f291e09de69044ad7c4e04ccef3364f03cbbf;hpb=e499446c25f3bf6891250fe1b0b23ede1114daeb;p=nodemanager.git diff --git a/sliver_lxc.py b/sliver_lxc.py index 518f291..5892eed 100644 --- a/sliver_lxc.py +++ b/sliver_lxc.py @@ -44,6 +44,7 @@ class Sliver_LXC(Sliver_Libvirt, Initscript): Initscript.__init__(self,name) def configure(self, rec): + logger.log('========== sliver_lxc.configure {}'.format(self.name)) Sliver_Libvirt.configure(self, rec) # in case we update nodemanager.. @@ -51,7 +52,11 @@ class Sliver_LXC(Sliver_Libvirt, Initscript): # do the configure part from Initscript Initscript.configure(self, rec) + # remember configure() always gets called *before* start() + # in particular the slice initscript + # is expected to be in place already at this point def start(self, delay=0): + logger.log('==================== sliver_lxc.start {}'.format(self.name)) if 'enabled' in self.rspec and self.rspec['enabled'] <= 0: logger.log('sliver_lxc: not starting %s, is not enabled'%self.name) return @@ -62,7 +67,7 @@ class Sliver_LXC(Sliver_Libvirt, Initscript): Account.mount_ssh_dir(self.name) Sliver_Libvirt.start(self, delay) # if a change has occured in the slice initscript, reflect this in /etc/init.d/vinit.slice - self.refresh_slice_vinit(force=True) + self.refresh_slice_vinit() def rerun_slice_vinit(self): """This is called at startup, and whenever the initscript code changes"""