From: Frank Brehm Date: Wed, 17 Jun 2020 14:32:33 +0000 (+0200) Subject: Ensuring create-motd.sh on Cobbler Webserver X-Git-Tag: 2.1.2^2~9^2~31^2~24 X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=da31d01b8c0a468877070257b1c6eb91a1b584ca;p=pixelpark%2Fcreate-vmware-tpl.git Ensuring create-motd.sh on Cobbler Webserver --- diff --git a/lib/cr_vmware_tpl/cobbler.py b/lib/cr_vmware_tpl/cobbler.py index f91294f..4590aec 100644 --- a/lib/cr_vmware_tpl/cobbler.py +++ b/lib/cr_vmware_tpl/cobbler.py @@ -40,7 +40,7 @@ from .config import CrTplConfiguration from .xlate import XLATOR -__version__ = '0.5.8' +__version__ = '0.5.9' LOG = logging.getLogger(__name__) @@ -641,6 +641,20 @@ class Cobbler(BaseHandler): loc=str(local_rc_file), rem=str(remote_rc_file))) self.ensure_remote_file(local_rc_file, remote_rc_file, check_parent=False) + # ------------------------------------------------------------------------- + def ensure_create_motd(self): + + local_script = self.base_dir / 'bin' / 'create-motd.sh' + docroot = self.config.cobbler_ws_docroot / self.config.cobbler_ws_rel_filesdir + remote_dir = docroot / self.config.system_status + remote_script = remote_dir / local_script.name + + LOG.info(_("Ensuring currentness of create-motd.sh.")) + + LOG.debug(_("Ensuring {loc!r} => {rem!r}.").format( + loc=str(local_script), rem=str(remote_script))) + self.ensure_remote_file(local_script, remote_script, check_parent=False) + # ------------------------------------------------------------------------- def add_system(self, name, fqdn, mac_address, comment=None): """Creating a new system.""" diff --git a/lib/cr_vmware_tpl/handler.py b/lib/cr_vmware_tpl/handler.py index 275c578..38c37fe 100644 --- a/lib/cr_vmware_tpl/handler.py +++ b/lib/cr_vmware_tpl/handler.py @@ -42,7 +42,7 @@ from .cobbler import CobblerError, Cobbler from .xlate import XLATOR -__version__ = '1.6.3' +__version__ = '1.6.4' LOG = logging.getLogger(__name__) TZ = pytz.timezone('Europe/Berlin') @@ -234,6 +234,7 @@ class CrTplHandler(BaseHandler): self.cobbler.ensure_keys() self.cobbler.ensure_repo_files() self.cobbler.ensure_bashrc() + self.cobbler.ensure_create_motd() self.vsphere.get_about() self.vsphere.get_clusters()