mirror of
https://github.com/retspen/webvirtcloud
synced 2026-11-11 12:46:49 +00:00
fix(console): a VM with a QEMU websocket port opens through novncd
A VM defined with QEMU's own VNC websocket (graphics websocket='...', which the panel never sets) made the console page connect to that port on the panel's host name: the port is on the compute, so the console did not open unless the panel ran on that compute, and then it bypassed novncd and the panel's console token. Such a VM has its ordinary VNC port too, and novncd now reaches it there like any other VM.
This commit is contained in:
parent
3bd9fe63e5
commit
554e3a7995
5 changed files with 6 additions and 31 deletions
|
|
@ -54,7 +54,6 @@ def console(request, compute_id, uuid):
|
|||
uuid=instance.uuid,
|
||||
)
|
||||
console_type = conn.get_console_type()
|
||||
console_websocket_port = conn.get_console_websocket_port()
|
||||
console_passwd = conn.get_console_passwd()
|
||||
running = conn.instance.isActive()
|
||||
# novncd reaches a console that listens on its host's loopback only
|
||||
|
|
@ -63,7 +62,6 @@ def console(request, compute_id, uuid):
|
|||
except (libvirtError, ValueError, IndexError, Instance.DoesNotExist):
|
||||
running = unreachable = False
|
||||
console_type = None
|
||||
console_websocket_port = None
|
||||
console_passwd = None
|
||||
|
||||
if console_type and not running: # a shut-off VM has no console to connect to
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue