From 667b4097e91c477c867f149939f24afd3d4dfa97 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 31 Jan 2014 17:38:00 +0100 Subject: [PATCH] support for systemd in sliver space for user-provided initscripts --- Makefile | 7 +++++++ initscript.py | 51 +++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 46 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 12645da..5da2c2a 100644 --- a/Makefile +++ b/Makefile @@ -35,6 +35,9 @@ install-lib: install-miscell install-startup --install-scripts=$(DESTDIR)/$(bindir) # might be better in setup.py ? +# NOTE: the sliver-initscripts/ and sliver-systemd stuff, being, well, for slivers, +# need to ship on all nodes regardless of WITH_INIT and WITH_SYSTEMD that +# impacts how nodemanager itself gets started install-miscell: install -d -m 755 $(DESTDIR)/var/lib/nodemanager install -D -m 444 README $(DESTDIR)/$(datadir)/NodeManager/README @@ -43,7 +46,11 @@ install-miscell: mkdir -p $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts rsync -av sliver-initscripts/ $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts/ chmod 755 $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts/ + mkdir -p $(DESTDIR)/$(datadir)/NodeManager/sliver-systemd + rsync -av sliver-systemd/ $(DESTDIR)/$(datadir)/NodeManager/sliver-systemd/ + chmod 755 $(DESTDIR)/$(datadir)/NodeManager/sliver-systemd/ +# this now is for the startup of nodemanager itself ifneq "$(WITH_SYSTEMD)" "" install-startup: install-systemd endif diff --git a/initscript.py b/initscript.py index e2aada5..b448261 100644 --- a/initscript.py +++ b/initscript.py @@ -1,5 +1,3 @@ -# Restarting nm (via systemctl): Warning: Unit file of created job changed on disk, 'systemctl --system daemon-reload' recommended. - import os, os.path import tools @@ -20,29 +18,58 @@ class Initscript: #self.initscriptchanged = True self.refresh_slice_vinit() - # unconditionnally install and enable the generic vinit script - # mimicking chkconfig for enabling the generic vinit script - # this is hardwired for runlevel 3 def install_and_enable_vinit (self): + # the fact that systemd attempts to run old-style services + # says we should do either or or the other and not both + # but actually if that was true we could just do it for init and be fine + # which is not what we've seen starting with f18 + # so for now let's do it for both systems unconditionnally self.install_and_enable_vinit_for_init () + self.install_and_enable_vinit_for_systemd () - def install_and_enable_vinit_for_init (): + # unconditionnally install and enable the generic vinit script + # mimicking chkconfig for enabling the generic vinit script + # this is hardwired for runlevel 3 + def install_and_enable_vinit_for_init (self): "suitable for init-based VMs" vinit_source="/usr/share/NodeManager/sliver-initscripts/vinit" vinit_script="/vservers/%s/etc/rc.d/init.d/vinit"%self.name - rc3_link="/vservers/%s/etc/rc.d/rc3.d/S99vinit"%self.name - rc3_target="../init.d/vinit" + 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): logger.log("Initscript: %s: installed generic vinit rc script"%self.name) # create symlink for runlevel 3 - if not os.path.islink(rc3_link): + if not os.path.islink(enable_link): try: - logger.log("Initscript: %s: creating runlevel3 symlink %s"%(self.name,rc3_link)) - os.symlink(rc3_target,rc3_link) + logger.log("Initscript: %s: creating runlevel3 symlink %s"%(self.name,enable_link)) + os.symlink(enable_target,enable_link) except: - logger.log_exc("Initscript: %s: failed to create runlevel3 symlink %s"%rc3_link) + logger.log_exc("Initscript: %s: failed to create runlevel3 symlink %s"%enable_link) + + # very similar but with systemd unit files - we target 'multi-user' in this context + def install_and_enable_vinit_for_systemd(self): + "suitable for systemd-based VMs" + 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): + logger.log("Initscript: %s: installed vinit.service unit file"%self.name) + # create symlink for enabling this unit + if not os.path.islink(enable_link): + try: + logger.log("Initscript: %s: creating enabling symlink %s"%(self.name,enable_link)) + os.symlink(enable_target,enable_link) + except: + logger.log_exc("Initscript: %s: failed to create enabling symlink %s"%enable_link) + + +#ln -s '/usr/lib/systemd/system/vinit.service' '/etc/systemd/system/multi-user.target.wants/vinit.service' + # install or remove the slice inistscript, as instructed by the initscript tag def refresh_slice_vinit(self): -- 2.43.0