From: Frank Brehm Date: Wed, 24 Oct 2018 09:14:35 +0000 (+0200) Subject: Using VsphereServer for vsphere oprations X-Git-Tag: 0.3.2^2~35 X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=f4d42c778c75ae1c4576a7db8a8af15d3bb4908c;p=pixelpark%2Fcreate-vmware-tpl.git Using VsphereServer for vsphere oprations --- diff --git a/lib/cr_vmware_tpl/handler.py b/lib/cr_vmware_tpl/handler.py index 75dd9e1..266fbda 100644 --- a/lib/cr_vmware_tpl/handler.py +++ b/lib/cr_vmware_tpl/handler.py @@ -38,10 +38,11 @@ from fb_tools.errors import CannotConnectVsphereError, NoDatastoreFoundError from fb_tools.handler import BaseHandler from fb_tools.vsphere import BaseVsphereHandler +from fb_tools.vsphere.server import VsphereServer from .config import CrTplConfiguration -__version__ = '0.10.1' +__version__ = '0.10.2' LOG = logging.getLogger(__name__) TZ = pytz.timezone('Europe/Berlin') @@ -106,12 +107,12 @@ class CrTplHandler(BaseHandler): self.abort = False self.postinstall_errors = None - self.vsphere = BaseVsphereHandler( + self.vsphere = VsphereServer( appname=self.appname, verbose=self.verbose, base_dir=self.base_dir, host=self.config.vsphere_host, port=self.config.vsphere_port, user=self.config.vsphere_user, password=self.config.password, dc=self.config.dc, cluster=self.config.vsphere_cluster, - simulate=self.simulate, force=self.force, + auto_close=True, simulate=self.simulate, force=self.force, terminal_has_colors=self.terminal_has_colors, initialized=False) if initialized: diff --git a/python_fb_tools b/python_fb_tools index a44f6dc..d542794 160000 --- a/python_fb_tools +++ b/python_fb_tools @@ -1 +1 @@ -Subproject commit a44f6dc298b3ecbacceab04c51ca82d0b1a4b71e +Subproject commit d542794caaf1b5336ad451901cbb0b9e6d58b6b2