X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=initscript.py;h=354839455f174e339665a93132eb81ef7e6e3bc2;hb=ccc7b9c4b76a89faad66867b00d16ac45333b6de;hp=b448261da6ea9b130764c0afbea20c65bc1bc102;hpb=667b4097e91c477c867f149939f24afd3d4dfa97;p=nodemanager.git diff --git a/initscript.py b/initscript.py index b448261..3548394 100644 --- a/initscript.py +++ b/initscript.py @@ -5,11 +5,11 @@ import logger class Initscript: - def __init__ (self, name): - self.name=name + def __init__(self, name): + self.name = name self.initscript = '' - def configure (self, rec): + def configure(self, rec): # logger.log("Initscript.configure") new_initscript = rec['initscript'] if new_initscript != self.initscript: @@ -18,66 +18,72 @@ class Initscript: #self.initscriptchanged = True self.refresh_slice_vinit() - def install_and_enable_vinit (self): + def install_and_enable_vinit(self): + "prepare sliver rootfs init and systemd so the vinit service kicks in" # the fact that systemd attempts to run old-style services - # says we should do either or or the other and not both + # says we should do either one 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 () + # so we try for a systemd system, and if it fails it means + # one of the dir does not exist and so we are dealing with an init-based rootfs + try: + self.install_and_enable_vinit_for_systemd () + except: + self.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 - enable_link="/vservers/%s/etc/rc.d/rc3.d/S99vinit"%self.name - enable_target="../init.d/vinit" + 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 + 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) + 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(enable_link): try: - logger.log("Initscript: %s: creating runlevel3 symlink %s"%(self.name,enable_link)) - os.symlink(enable_target,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: %s: failed to create runlevel3 symlink %s"%enable_link) + logger.log_exc("Initscript failed to create runlevel3 symlink %s" % enable_link, name=self.name) # 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" + """ + 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) + 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) + 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' + 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): - 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): + 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)) + 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 @@ -85,5 +91,6 @@ class Initscript: # /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)) - + logger.log("Initscript: %s: Removed obsolete initscript %s" % (self.name, sliver_initscript)) + else: + logger.log("initscript.refresh_slice_vinit {} - void".format(self.name))