X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FLocalSubstrate.inria.py;h=76ac30ec356dce08af7b51f44d06ca693c1e708f;hb=45571868d086f2247eab2990c3fdd2c58d256ab4;hp=cc7b58ccf21bd6164827f9d13978226ea096f694;hpb=f2b44361ae252bbd2f4459f1d56850f2fd269353;p=tests.git diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py index cc7b58c..76ac30e 100755 --- a/system/LocalSubstrate.inria.py +++ b/system/LocalSubstrate.inria.py @@ -24,14 +24,16 @@ class OnelabSubstrate (Substrate): # the vs-capable box for PLCs def plc_vs_boxes_spec (self): - return [ ('warhol', 35), # how many plcs max in this box - ] + return [ +# ('warhol', 35), # how many plcs max in this box + ] # the lxc-capable box for PLCs def plc_lxc_boxes_spec (self): return [ -# ('gotan', 30), # how many plcs max in this box - ('deathvegas', 30), +# gotan has fsck issues and is being reinstalled under f20 +# ('gotan', 10), # how many plcs max in this box + ('deathvegas', 10), ] # vplc01 to 40 @@ -42,12 +44,13 @@ class OnelabSubstrate (Substrate): def qemu_boxes_spec (self): return [ # how many qemus max in this box +# enfoui runs f18 - also can't seem to enter BIOS on that one + ('kvm64-6', 4), # 4 cores, 8Gb ('kvm64-1', 3), # 4 cores, 4Gb ('kvm64-2', 3), # 4 cores, 4Gb - ('kvm64-3', 2), # 2 cores, 4Gb - ('kvm64-4', 1), # 4 cores, 8Gb + ('kvm64-4', 2), # 4 cores, 8Gb + ('kvm64-3', 1), # 2 cores, 4Gb ('kvm64-5', 1), # 2 cores, 4Gb - ('kvm64-6', 2), # 2 cores, 4Gb ] # the nodes pool has a MAC address as user-data (3rd elt in tuple)