reguire gnupg1 on f>=31; sense the system to use gpg1 when installed

[nodemanager.git] / initscript.py

diff --git a/initscript.py b/initscript.py
index adeaa71..392b66b 100644 (file)
--- a/initscript.py
+++ b/initscript.py
@@ -10,13 +10,25 @@ class Initscript:
         self.initscript = ''
 
     def configure(self, rec):
-#        logger.log("Initscript.configure")
+        # install or remove the slice inistscript, as instructed by the initscript tag
         new_initscript = rec['initscript']
-        if new_initscript != self.initscript:
-            self.initscript = new_initscript
-            # not used anymore, we always check against the installed script
-            #self.initscriptchanged = True
-            self.refresh_slice_vinit()
+        if new_initscript == self.initscript:
+            return
+        logger.log("initscript.configure {}".format(self.name))
+        self.initscript = new_initscript
+        code = self.initscript
+        sliver_initscript = "/vservers/%s/etc/rc.d/init.d/vinit.slice" % self.name
+        if tools.replace_file_with_string(sliver_initscript, code, remove_if_empty=True, chmod=0o755):
+            if code:
+                logger.log("Initscript: %s: Installed new initscript in %s" % (self.name, sliver_initscript))
+                if self.is_running():
+                    # Only need to rerun the initscript if the vserver is
+                    # already running. If the vserver isn't running, then the
+                    # initscript will automatically be started by
+                    # /etc/rc.d/vinit when the vserver is started.
+                    self.rerun_slice_vinit()
+            else:
+                logger.log("Initscript: %s: Removed obsolete initscript %s" % (self.name, sliver_initscript))
 
     def install_and_enable_vinit(self):
         "prepare sliver rootfs init and systemd so the vinit service kicks in"
@@ -43,13 +55,14 @@ class Initscript:
         enable_link = "/vservers/%s/etc/rc.d/rc3.d/S99vinit" % self.name
         enable_target = "../init.d/vinit"
         # install in sliver
-        code = file(vinit_source).read()
-        if tools.replace_file_with_string(vinit_script, code, chmod=0755):
+        with open(vinit_source) as f:
+            code = f.read()
+        if tools.replace_file_with_string(vinit_script, code, chmod=0o755):
             logger.log("Initscript: %s: installed generic vinit rc script" % self.name)
         # create symlink for runlevel 3
         if not os.path.islink(enable_link):
             try:
-                logger.log("Initscript: %s: creating runlevel3 symlink %s" % (self.name,enable_link))
+                logger.log("Initscript: %s: creating runlevel3 symlink %s" % (self.name, enable_link))
                 os.symlink(enable_target, enable_link)
             except:
                 logger.log_exc("Initscript failed to create runlevel3 symlink %s" % enable_link, name=self.name)
@@ -59,13 +72,32 @@ class Initscript:
         """
         suitable for systemd-based VMs
         """
+
+        ##########
+        ########## initscripts : current status - march 2015
+        ##########
+        #
+        # the initscripts business worked smoothly up to f18 inclusive
+        # 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
+        # 
+        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
         enable_link = "/vservers/%s/etc/systemd/system/multi-user.target.wants/vinit.service" % self.name
         enable_target = "/usr/lib/systemd/system/vinit.service"
         # install in sliver
-        code = file(vinit_source).read()
-        if tools.replace_file_with_string(vinit_unit_file, code, chmod=0755):
+        with open(vinit_source) as f:
+            code = f.read()
+        if tools.replace_file_with_string(vinit_unit_file, code, chmod=0o755):
             logger.log("Initscript: %s: installed vinit.service unit file" % self.name)
         # create symlink for enabling this unit
         if not os.path.islink(enable_link):
@@ -73,24 +105,4 @@ class Initscript:
                 logger.log("Initscript: %s: creating enabling symlink %s" % (self.name, enable_link))
                 os.symlink(enable_target, enable_link)
             except:
-                logger.log_exc("Initscript failed to create enabling symlink %s" % enable_link,name=name)
-
-
-    # install or remove the slice inistscript, as instructed by the initscript tag
-    def refresh_slice_vinit(self):
-        logger.log("initscript.refresh_slice_vinit {}".format(self.name))
-        code = self.initscript
-        sliver_initscript="/vservers/%s/etc/rc.d/init.d/vinit.slice" % self.name
-        if tools.replace_file_with_string(sliver_initscript, code, remove_if_empty=True, chmod=0755):
-            if code:
-                logger.log("Initscript: %s: Installed new initscript in %s" % (self.name, sliver_initscript))
-                if self.is_running():
-                    # Only need to rerun the initscript if the vserver is
-                    # already running. If the vserver isn't running, then the
-                    # initscript will automatically be started by
-                    # /etc/rc.d/vinit when the vserver is started.
-                    self.rerun_slice_vinit()
-            else:
-                logger.log("Initscript: %s: Removed obsolete initscript %s" % (self.name, sliver_initscript))
-        else:
-            logger.debug("initscript.refresh_slice_vinit {} - void".format(self.name))
+                logger.log_exc("Initscript failed to create enabling symlink %s" % enable_link, name=name)