From a4851622afee707536e1aa2af6e95324f77b738e Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 16 May 2018 17:54:44 +0200 Subject: [PATCH] Output changes --- lib/cr_vmware_tpl/app.py | 2 +- lib/cr_vmware_tpl/handler.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/cr_vmware_tpl/app.py b/lib/cr_vmware_tpl/app.py index 64c037a..55e3691 100644 --- a/lib/cr_vmware_tpl/app.py +++ b/lib/cr_vmware_tpl/app.py @@ -34,7 +34,7 @@ from .config import CrTplConfiguration from .handler import ExpectedHandlerError, CrTplHandler -__version__ = '0.6.1' +__version__ = '0.6.2' LOG = logging.getLogger(__name__) diff --git a/lib/cr_vmware_tpl/handler.py b/lib/cr_vmware_tpl/handler.py index 1e25c14..315067c 100644 --- a/lib/cr_vmware_tpl/handler.py +++ b/lib/cr_vmware_tpl/handler.py @@ -36,7 +36,7 @@ from .obj import PpBaseObject from .config import CrTplConfiguration -__version__ = '0.9.1' +__version__ = '0.9.2' LOG = logging.getLogger(__name__) TZ = pytz.timezone('Europe/Berlin') @@ -226,11 +226,11 @@ class CrTplHandler(PpBaseObject): LOG.warn("Aborting after creation of template VM.") LOG.warn("You are responsible yourself to cleaning up the VM!!!") else: + self.post_install_tasks_ssh() if self.postinstall_errors: self.purge_template_vm() return 10 else: - self.post_install_tasks_ssh() self.poweroff_vm() self.change_mac_address() if not self.abort and not self.postinstall_errors: @@ -831,6 +831,8 @@ class CrTplHandler(PpBaseObject): if output: self.postinstall_errors = output LOG.error("Got postinstall errors:\n{}".format(output)) + else: + LOG.info("No postinstall errors found.") finally: if ssh: @@ -856,7 +858,7 @@ class CrTplHandler(PpBaseObject): # ------------------------------------------------------------------------- def post_install_tasks_ssh(self): - LOG.info("Executing tasks per SSH after successful installation ...") + LOG.info("Executing tasks per SSH after installation ...") ssh = None -- 2.39.5