From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Tue, 23 Jun 2020 09:20:25 +0000 (+0200)
Subject: Enabling last steps in lib/cr_vmware_tpl/handler.py
X-Git-Tag: 2.1.2^2~9^2~31^2~4
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=507f5e04c5975ee92baf36b76566270e201f1e3b;p=pixelpark%2Fcreate-vmware-tpl.git

Enabling last steps in lib/cr_vmware_tpl/handler.py
---

diff --git a/lib/cr_vmware_tpl/handler.py b/lib/cr_vmware_tpl/handler.py
index e87e097..35a807f 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.7.4'
+__version__ = '1.7.5'
 
 LOG = logging.getLogger(__name__)
 TZ = pytz.timezone('Europe/Berlin')
@@ -312,8 +312,6 @@ class CrTplHandler(BaseHandler):
                     self.poweroff_vm()
                 self.cobbler.remove_system(tpl_sysname)
 
-        return 0
-
         if not self.abort and not self.postinstall_errors:
             self.rotate_templates()
             if not self.rotate_only:
@@ -986,7 +984,7 @@ class CrTplHandler(BaseHandler):
     def rename_and_change_vm(self):
 
         LOG.info(_("Renaming VM {o!r} => {n!r} ...").format(
-            o=self.config.template_vm, n=self.config.template_name))
+            o=self.tpl_vm_fqdn, n=self.config.template_name))
 
         vm = self.get_temp_tpl_vm()
         task = vm.Rename_Task(self.config.template_name)