Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pve-manager
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
pve-manager
Commits
181861f6
Commit
181861f6
authored
Jun 29, 2015
by
Alexandre Derumier
Committed by
Dietmar Maurer
Jun 29, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add node embedded vnc console
Signed-off-by:
Alexandre Derumier
<
aderumier@odiso.com
>
parent
a3ec79d6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
6 deletions
+16
-6
VNCConsole.js
www/manager/VNCConsole.js
+9
-6
Config.js
www/manager/node/Config.js
+7
-0
No files found.
www/manager/VNCConsole.js
View file @
181861f6
...
@@ -15,14 +15,14 @@ Ext.define('PVE.noVncConsole', {
...
@@ -15,14 +15,14 @@ Ext.define('PVE.noVncConsole', {
throw
"
no node name specified
"
;
throw
"
no node name specified
"
;
}
}
if
(
!
me
.
vmid
)
{
throw
"
no VM ID specified
"
;
}
if
(
!
me
.
consoleType
)
{
if
(
!
me
.
consoleType
)
{
throw
"
no console type specified
"
;
throw
"
no console type specified
"
;
}
}
if
(
!
me
.
vmid
&&
me
.
consoleType
!==
'
shell
'
)
{
throw
"
no VM ID specified
"
;
}
// always use same iframe, to avoid running several noVnc clients
// always use same iframe, to avoid running several noVnc clients
// at same time (to avoid performance problems)
// at same time (to avoid performance problems)
var
box
=
Ext
.
create
(
'
widget.uxiframe
'
,
{
id
:
"
vncconsole
"
});
var
box
=
Ext
.
create
(
'
widget.uxiframe
'
,
{
id
:
"
vncconsole
"
});
...
@@ -33,8 +33,11 @@ Ext.define('PVE.noVncConsole', {
...
@@ -33,8 +33,11 @@ Ext.define('PVE.noVncConsole', {
items
:
box
,
items
:
box
,
listeners
:
{
listeners
:
{
show
:
function
()
{
show
:
function
()
{
box
.
load
(
'
/?console=
'
+
me
.
consoleType
+
'
&novnc=1&vmid=
'
+
me
.
vmid
+
var
url
=
'
/?console=
'
+
me
.
consoleType
+
'
&novnc=1&node=
'
+
me
.
nodename
+
'
&resize=scale
'
;
'
&node=
'
+
me
.
nodename
+
'
&resize=scale
'
);
if
(
me
.
vmid
)
{
url
+=
'
&vmid=
'
+
me
.
vmid
;
}
box
.
load
(
url
);
}
}
}
}
});
});
...
...
www/manager/node/Config.js
View file @
181861f6
...
@@ -197,6 +197,13 @@ Ext.define('PVE.node.Config', {
...
@@ -197,6 +197,13 @@ Ext.define('PVE.node.Config', {
itemId
:
'
apt
'
,
itemId
:
'
apt
'
,
xtype
:
'
pveNodeAPT
'
,
xtype
:
'
pveNodeAPT
'
,
nodename
:
nodename
nodename
:
nodename
},
{
title
:
gettext
(
'
Console
'
),
itemId
:
'
console
'
,
xtype
:
'
pveNoVncConsole
'
,
consoleType
:
'
shell
'
,
nodename
:
nodename
}
}
]);
]);
me
.
items
.
push
([{
me
.
items
.
push
([{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment