diff options
Diffstat (limited to 'os-plugins/plugins/vmgrid/OpenSLX/OSPlugin/vmgrid.pm')
| -rw-r--r-- | os-plugins/plugins/vmgrid/OpenSLX/OSPlugin/vmgrid.pm | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/os-plugins/plugins/vmgrid/OpenSLX/OSPlugin/vmgrid.pm b/os-plugins/plugins/vmgrid/OpenSLX/OSPlugin/vmgrid.pm index c3542274..d90a6f53 100644 --- a/os-plugins/plugins/vmgrid/OpenSLX/OSPlugin/vmgrid.pm +++ b/os-plugins/plugins/vmgrid/OpenSLX/OSPlugin/vmgrid.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2008, 2009 - OpenSLX GmbH +# Copyright (c) 2008, 2010 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -6,7 +6,7 @@ # If you have any feedback please consult http://openslx.org/feedback and # send your suggestions, praise, or complaints to feedback@openslx.org # -# General information about OpenSLX can be found at http://openslx.org/ +# General information about OpenSLX can be found at http://openslx.org # ----------------------------------------------------------------------------- # vmgrid.pm # - ... @@ -107,7 +107,7 @@ sub getAttrInfo applies_to_clients => 1, description => unshiftHereDoc(<<' End-of-Here'), location of virtual images - for starts /wo full path + for starts /w relative path End-of-Here content_descr => 'absolute path to vm image files', default => '/var/lib/virt/vmgrid/images', @@ -117,7 +117,7 @@ sub getAttrInfo applies_to_clients => 1, description => unshiftHereDoc(<<' End-of-Here'), location of XML configuration for virtual images - for starts /wo full path + for starts /w relative path End-of-Here content_descr => 'absolute path to vm xml files', default => '/var/lib/virt/vmgrid/xml', @@ -150,7 +150,6 @@ sub getAttrInfo applies_to_clients => 1, description => unshiftHereDoc(<<' End-of-Here'), use this number of vcpus as maximum for one vm - will be used only if applicable (only if supported by plugin) End-of-Here content_regex => qr{^(1|2|4|8|16)$}, @@ -162,7 +161,6 @@ sub getAttrInfo applies_to_clients => 1, description => unshiftHereDoc(<<' End-of-Here'), use this number of vcpus as minimum for one vm - will be used only if applicable (only if supported by plugin) End-of-Here content_regex => qr{^(1|2|4|8|16)$}, @@ -180,35 +178,33 @@ sub getAttrInfo according to their ratio if less than 4 VMs defined in startvms the memory is being reserved for a later manual start - set to 0 if you don't intend to start them manually + set to 0 if you do not intend to start them manually (only if supported by plugin) End-of-Here content_regex => qr{^(\d\d??,\d\d??,\d\d??,\d\d??,\d\d??,\d\d??)$}, content_descr => '\d\d??,\d\d??,\d\d??,\d\d??,\d\d??,\d\d??', default => '40,0,0,0,40,20', }, - 'vmgrid::maxram' => { + 'vmgrid::maxmem' => { applies_to_systems => 1, applies_to_clients => 1, description => unshiftHereDoc(<<' End-of-Here'), - maximum of RAM used for ALL vms - will be used only if applicable + maximum RAM used by one vm (only if supported by plugin) End-of-Here - content_regex => qr{^(1|2|3|4|5|6|7|8|9)}, - content_descr => 'absolute or relative e.g. 512 or 50%', + content_regex => qr{^(\d\d\d\d??\d??)$}, + content_descr => 'absolute amount: \d\d\d\d??\d??', default => undef, }, - 'vmgrid::minram' => { - applies_to_systems => 1, + 'vmgrid::minmem' => { + applies_to_systems => 1, applies_to_clients => 1, description => unshiftHereDoc(<<' End-of-Here'), - minimum of RAM used for ALL vms - will be used only if applicable + minimum RAM used by one vm (only if supported by plugin) End-of-Here - content_regex => qr{^(1|2|3|4|5|6|7|8|9)}, - content_descr => 'absolute or relative e.g. 512 or 50%', + content_regex => qr{^(\d\d\d\d??\d??)$}, + content_descr => 'absolute amount: \d\d\d\d??\d??', default => undef, }, }; |