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
544787a1
Commit
544787a1
authored
Jun 02, 2015
by
Dietmar Maurer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
LXC GUI: use cpulimit instead of cpus
And move cpuunits to resource panel.
parent
828f6daf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
20 deletions
+19
-20
Options.js
www/manager/lxc/Options.js
+0
-16
Resources.js
www/manager/lxc/Resources.js
+19
-4
No files found.
www/manager/lxc/Options.js
View file @
544787a1
...
@@ -50,22 +50,6 @@ Ext.define('PVE.lxc.Options', {
...
@@ -50,22 +50,6 @@ Ext.define('PVE.lxc.Options', {
storage
:
{
storage
:
{
header
:
gettext
(
'
Storage
'
),
header
:
gettext
(
'
Storage
'
),
defaultValue
:
'
no set
'
defaultValue
:
'
no set
'
},
cpuunits
:
{
header
:
gettext
(
'
CPU units
'
),
defaultValue
:
'
1024
'
,
editor
:
caps
.
vms
[
'
VM.Config.CPU
'
]
?
{
xtype
:
'
pveWindowEdit
'
,
subject
:
gettext
(
'
CPU units
'
),
items
:
{
xtype
:
'
numberfield
'
,
name
:
'
cpuunits
'
,
fieldLabel
:
gettext
(
'
CPU units
'
),
minValue
:
8
,
maxValue
:
500000
,
allowBlank
:
false
}
}
:
undefined
}
}
};
};
...
...
www/manager/lxc/Resources.js
View file @
544787a1
...
@@ -49,11 +49,20 @@ Ext.define('PVE.lxc.RessourceInputPanel', {
...
@@ -49,11 +49,20 @@ Ext.define('PVE.lxc.RessourceInputPanel', {
},
},
{
{
xtype
:
'
numberfield
'
,
xtype
:
'
numberfield
'
,
name
:
'
cpu
s
'
,
name
:
'
cpu
limit
'
,
minValue
:
0
,
minValue
:
0
,
value
:
'
1
'
,
value
:
'
1
'
,
step
:
1
,
step
:
1
,
fieldLabel
:
gettext
(
'
CPUs
'
),
fieldLabel
:
gettext
(
'
CPU limit
'
),
labelWidth
:
labelWidth
,
allowBlank
:
false
},
{
xtype
:
'
numberfield
'
,
name
:
'
cpuunits
'
,
fieldLabel
:
gettext
(
'
CPU units
'
),
minValue
:
8
,
maxValue
:
500000
,
labelWidth
:
labelWidth
,
labelWidth
:
labelWidth
,
allowBlank
:
false
allowBlank
:
false
}
}
...
@@ -122,8 +131,8 @@ Ext.define('PVE.lxc.RessourceView', {
...
@@ -122,8 +131,8 @@ Ext.define('PVE.lxc.RessourceView', {
return
PVE
.
Utils
.
format_size
(
value
*
1024
*
1024
);
return
PVE
.
Utils
.
format_size
(
value
*
1024
*
1024
);
}
}
},
},
cpu
s
:
{
cpu
limit
:
{
header
:
gettext
(
'
Processors
'
),
header
:
gettext
(
'
CPU limit
'
),
never_delete
:
true
,
never_delete
:
true
,
editor
:
resEditor
,
editor
:
resEditor
,
defaultValue
:
1
,
defaultValue
:
1
,
...
@@ -132,6 +141,12 @@ Ext.define('PVE.lxc.RessourceView', {
...
@@ -132,6 +141,12 @@ Ext.define('PVE.lxc.RessourceView', {
return
gettext
(
'
unlimited
'
);
return
gettext
(
'
unlimited
'
);
}
}
},
},
cpuunits
:
{
header
:
gettext
(
'
CPU units
'
),
never_delete
:
true
,
editor
:
resEditor
,
defaultValue
:
1024
},
disk
:
{
disk
:
{
header
:
gettext
(
'
Disk size
'
),
header
:
gettext
(
'
Disk size
'
),
editor
:
resEditor
,
editor
:
resEditor
,
...
...
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