Create a HTML5 console type on top of VNC and WebMKS

https://bugzilla.redhat.com/show_bug.cgi?id=1532720
ManageIQ · Jul 1, 2019 · 91e23fd · 91e23fd
1 parent 85acbf7
commit 91e23fd
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/app/models/manageiq/providers/vmware/infra_manager/vm/remote_console.rb b/app/models/manageiq/providers/vmware/infra_manager/vm/remote_console.rb
@@ -81,12 +81,16 @@ def validate_remote_console_webmks_support
  end
 
  #
- # VNC
+ # HTML5 selects the best available console type (VNC or WebMKS)
  #
  def remote_console_html5_acquire_ticket(userid, originating_server)
- remote_console_vnc_acquire_ticket(userid, originating_server)
+ protocol = with_provider_object { |v| v.extraConfig["RemoteDisplay.vnc.enabled"] } ? 'vnc' : 'webmks'
+ send("remote_console_#{protocol}_acquire_ticket", userid, originating_server)
  end
 
+ #
+ # VNC
+ #
  def remote_console_vnc_acquire_ticket(userid, originating_server)
  validate_remote_console_acquire_ticket("vnc")