]> Frank Brehm's Git Trees - pixelpark/create-vmware-tpl.git/commitdiff
Output changes
authorFrank Brehm <frank.brehm@pixelpark.com>
Wed, 16 May 2018 15:54:44 +0000 (17:54 +0200)
committerFrank Brehm <frank.brehm@pixelpark.com>
Wed, 16 May 2018 15:54:44 +0000 (17:54 +0200)
lib/cr_vmware_tpl/app.py
lib/cr_vmware_tpl/handler.py

index 64c037a2dd7bbe21eafcabc36193418499aa4bdf..55e36915a28c466702a39cf01ac32f2303360ca7 100644 (file)
@@ -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__)
 
 
index 1e25c1459b6a349c5c6011acb4634358c02df6c8..315067c5c597db7005abef96f6623f99b3a595c5 100644 (file)
@@ -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