From ccc7b9c4b76a89faad66867b00d16ac45333b6de Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 13 Mar 2015 11:29:13 +0100 Subject: [PATCH] oops, too much messing about --- account.py | 4 ++-- sliver_lxc.py | 5 +++++ sliver_vs.py | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/account.py b/account.py index 063b6d0..293fc3f 100644 --- a/account.py +++ b/account.py @@ -207,7 +207,7 @@ class Worker: if rec['reservation_alive']: # this sliver has the lease, it is safe to start it if not self.is_running(): - self.start() + self.start(rec) else: self.configure(rec) else: # not having the lease, do not start it @@ -217,7 +217,7 @@ class Worker: # in a reservable node else: if not self.is_running() or next_class != curr_class: - self.start() + self.start(rec) else: self.configure(rec) diff --git a/sliver_lxc.py b/sliver_lxc.py index babac35..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 diff --git a/sliver_vs.py b/sliver_vs.py index 8a76218..c4dfadb 100644 --- a/sliver_vs.py +++ b/sliver_vs.py @@ -152,6 +152,7 @@ class Sliver_VS(vserver.VServer, Account, Initscript): Account.configure(self, rec) # install ssh keys + # remember configure() always gets called *before* start() def start(self, delay=0): if self.rspec['enabled'] <= 0: logger.log('sliver_vs: not starting %s, is not enabled'%self.name) -- 2.43.0