Commit 544787a1 authored by Dietmar Maurer's avatar Dietmar Maurer

LXC GUI: use cpulimit instead of cpus

And move cpuunits to resource panel.
parent 828f6daf
......@@ -50,22 +50,6 @@ Ext.define('PVE.lxc.Options', {
storage: {
header: gettext('Storage'),
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
}
};
......
......@@ -49,11 +49,20 @@ Ext.define('PVE.lxc.RessourceInputPanel', {
},
{
xtype: 'numberfield',
name: 'cpus',
name: 'cpulimit',
minValue: 0,
value: '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,
allowBlank: false
}
......@@ -122,8 +131,8 @@ Ext.define('PVE.lxc.RessourceView', {
return PVE.Utils.format_size(value*1024*1024);
}
},
cpus: {
header: gettext('Processors'),
cpulimit: {
header: gettext('CPU limit'),
never_delete: true,
editor: resEditor,
defaultValue: 1,
......@@ -132,6 +141,12 @@ Ext.define('PVE.lxc.RessourceView', {
return gettext('unlimited');
}
},
cpuunits: {
header: gettext('CPU units'),
never_delete: true,
editor: resEditor,
defaultValue: 1024
},
disk: {
header: gettext('Disk size'),
editor: resEditor,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment