Change in ovirt-engine[master]: engine: Integrate noVNC support
tjelinek at redhat.com
tjelinek at redhat.com
Thu May 30 09:02:11 UTC 2013
Tomas Jelinek has submitted this change and it was merged.
Change subject: engine: Integrate noVNC support
......................................................................
engine: Integrate noVNC support
This patch integrates noVNC support in the engine.
Firstly it adds noVNC HTML5 client into the engine to be served by jBoss.
Secondly it adds websockify script customized for oVirt. In production
mode, this script must be able to verify signatures issued by the engine
(for validating vnc connection data).
The behavior of VNC console invocation now depends on configuration in db -
option noVncProxy. The possible values are:
- 'Off' - feature is turned off - default.
- 'Host[:port]' - feature is on - engine assumes the proxy is deployed on each
host. port is optional, default is 6080.
- 'Engine[:port]' - feature is on - engine assumes the proxy is deployed on
itself. port is optional, default is 6080.
- host_fqdn_or_ip:port - feature is on, engine then assumes that the
proxy is deployed on the machine specified by host_fqdn_or_ip:port.
Things changed against last patchset:
- switched to plain ws protocol (only until the certificate creation is
integrated!)
- enabled logs for websockify
Things to be done:
- generating certificate for tls communication between proxy and client
- testing
Change-Id: I44e9870b88537360a1886e89c08f18865eae2ef0
Signed-off-by: Frantisek Kobzik <fkobzik at redhat.com>
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=838468
---
M Makefile
M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SignStringQuery.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/SignStringParameters.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
M backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml
A backend/manager/modules/root/src/main/webapp/ovirt-engine-novnc-main.html
A backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/TicketUtils.java
A frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractVnc.java
A frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/NoVncImpl.java
M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/UiCommonDefaultTypeResolver.java
A frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/VncNativeImpl.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java
A frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/INoVnc.java
A frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/IVnc.java
A frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/IVncNative.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VncConsoleModel.java
M ovirt-engine.spec.in
M packaging/conf/engine.conf.defaults.in
M packaging/conf/ovirt-engine-proxy.conf.in
A packaging/conf/ovirt-websocket-proxy.conf.defaults
A packaging/conf/ovirt-websocket-proxy.conf.defaults.in
M packaging/etc/engine-config/engine-config.properties
M packaging/services/config.py.in
A packaging/services/ovirt-websocket-proxy.py
A packaging/services/ovirt-websocket-proxy.systemd.in
A packaging/services/ovirt-websocket-proxy.sysv.in
29 files changed, 1,086 insertions(+), 20 deletions(-)
Approvals:
Tomas Jelinek: Looks good to me, approved
Frank Kobzik: Verified
--
To view, visit http://gerrit.ovirt.org/13931
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I44e9870b88537360a1886e89c08f18865eae2ef0
Gerrit-PatchSet: 11
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Frank Kobzik <fkobzik at redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl at redhat.com>
Gerrit-Reviewer: Barak Azulay <bazulay at redhat.com>
Gerrit-Reviewer: Frank Kobzik <fkobzik at redhat.com>
Gerrit-Reviewer: Itamar Heim <iheim at redhat.com>
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek at redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs at redhat.com>
More information about the Engine-commits
mailing list