From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 18 Mar 2015 20:07:10 +0000 (+0100)
Subject: turn off the initscript feature altogether in nodes that have machinectl (i.e. f20... 
X-Git-Tag: nodemanager-5.2-16~5
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=611d42afad7da211b12f87e2ad6f04b094f47011

turn off the initscript feature altogether in nodes that have machinectl (i.e. f20 and higher)
---

diff --git a/initscript.py b/initscript.py
index 152d25f..2d054fb 100644
--- a/initscript.py
+++ b/initscript.py
@@ -70,9 +70,23 @@ class Initscript:
         """
         suitable for systemd-based VMs
         """
-        # how are we wrt slice re-creation if we just kill this stuff
-        # of course no initscript will trigger at all ...
-        return
+
+        ##########
+        ########## initscripts : current status - march 2015
+        ##########
+        #
+        # the initscripts business worked smoothly up to f18 incusive
+        # with f20 and the apparition of machinectl, things started to
+        # behave really weird
+        #
+        # so starting with f20, after having tried pretty hard to get this right,
+        # but to no success obviously, and in order to stay on the safe side
+        # of the force, I am turning off the initscript machinery completely
+        # that is to say: the vinit.service does not get installed at all installed
+        # 
+        if os.path.isfile('/usr/bin/machinectl'):
+            logger.log("WARNING: initscripts are not supported anymore in nodes that have machinectl")
+            return
 
         vinit_source = "/usr/share/NodeManager/sliver-systemd/vinit.service"
         vinit_unit_file = "/vservers/%s/usr/lib/systemd/system/vinit.service" % self.name