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', { ...@@ -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
} }
}; };
......
...@@ -49,11 +49,20 @@ Ext.define('PVE.lxc.RessourceInputPanel', { ...@@ -49,11 +49,20 @@ Ext.define('PVE.lxc.RessourceInputPanel', {
}, },
{ {
xtype: 'numberfield', xtype: 'numberfield',
name: 'cpus', name: 'cpulimit',
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);
} }
}, },
cpus: { cpulimit: {
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,
......
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