sheppy/athq-vm-management
1
0
Fork 0
mirror of https://github.com/FAUSheppy/athq-vm-management synced 2025-12-06 05:41:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: support for non-lease external ips

Browse Source
This commit is contained in:
Johnathen Sheppard
2022-12-25 13:49:43 +01:00
parent eb86880a1f
commit 89404b358d
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vm.py
View File

@@ -12,8 +12,15 @@ class VM:
self.ports = args.get("ports") self.ports = args.get("ports")
self.terminateSSL = args.get("terminate-ssl") self.terminateSSL = args.get("terminate-ssl")
self.network = args.get("network") or "default" self.network = args.get("network") or "default"
self.lease = self._get_lease_for_hostname() self.isExternal = args.get("external")
self.ip = self.lease.get("ipaddr")
if self.isExternal:
self.lease = None
self.ip = None
else:
self.lease = self._get_lease_for_hostname()
self.ip = self.lease.get("ipaddr")
self.proxy_pass_options = args.get("proxy_pass_options") self.proxy_pass_options = args.get("proxy_pass_options")
self.proxy_pass_blob = "" self.proxy_pass_blob = ""
if self.proxy_pass_options: if self.proxy_pass_options:
@@ -47,6 +54,9 @@ class VM:
compositeName = "-".join((self.hostname, name, portstring, proto)) compositeName = "-".join((self.hostname, name, portstring, proto))
if self.isExternal:
self.ip = portStruct["ip"]
component = template.render(targetip=self.ip, udp=isUDP, portstring=portstring, component = template.render(targetip=self.ip, udp=isUDP, portstring=portstring,
transparent=transparent, proxy_timeout=proxy_timeout) transparent=transparent, proxy_timeout=proxy_timeout)
components.append(component) components.append(component)