From 4c5c41a20441efb2b8f4f9f52b7edb5a58a7b1a1 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 17 Jun 2020 13:42:20 +0200 Subject: [PATCH] Ensuring bashrc files on Cobbler Webserver --- lib/cr_vmware_tpl/cobbler.py | 17 ++++++++++++++++- lib/cr_vmware_tpl/handler.py | 3 ++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/cr_vmware_tpl/cobbler.py b/lib/cr_vmware_tpl/cobbler.py index 102b173..f91294f 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.7' +__version__ = '0.5.8' LOG = logging.getLogger(__name__) @@ -626,6 +626,21 @@ class Cobbler(BaseHandler): loc=str(local_snippet), rem=str(remote_snippet))) self.ensure_remote_file(local_snippet, remote_snippet, check_parent=False) + # ------------------------------------------------------------------------- + def ensure_bashrc(self): + + files_dir = self.base_dir / 'files' + docroot = self.config.cobbler_ws_docroot / self.config.cobbler_ws_rel_filesdir + remote_dir = docroot / self.config.system_status + + LOG.info(_("Ensuring currentness of bashrc files.")) + + for local_rc_file in files_dir.glob('bashrc*'): + remote_rc_file = remote_dir / local_rc_file.name + LOG.debug(_("Ensuring {loc!r} => {rem!r}.").format( + loc=str(local_rc_file), rem=str(remote_rc_file))) + self.ensure_remote_file(local_rc_file, remote_rc_file, 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 cfa96f1..275c578 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.2' +__version__ = '1.6.3' LOG = logging.getLogger(__name__) TZ = pytz.timezone('Europe/Berlin') @@ -233,6 +233,7 @@ class CrTplHandler(BaseHandler): self.cobbler.ensure_snippets() self.cobbler.ensure_keys() self.cobbler.ensure_repo_files() + self.cobbler.ensure_bashrc() self.vsphere.get_about() self.vsphere.get_clusters() -- 2.39.5