X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FLocalSubstrate.inria.py;h=9181ce25ecfcf29cfa72fd0c4f7dab170f9caa12;hb=d060f3ec02bcdcb8ba326051cd13f2e00e651dbf;hp=a5a39eb8befc6e50245d9aa28a953344096eabd8;hpb=2018172ed04f8cd645b877dd0ef38768ad1030b7;p=tests.git

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index a5a39eb..9181ce2 100755
--- a/system/LocalSubstrate.inria.py
+++ b/system/LocalSubstrate.inria.py
@@ -25,8 +25,9 @@ class OnelabSubstrate (Substrate):
    # the lxc-capable box for PLCs
    def plc_lxc_boxes_spec (self):
       return [ 
-         ('gotan', 10),         # how many plcs max in this box 
-         ('deathvegas', 10),    
+         ('gotan', 20),         # how many plcs max in this box 
+# deathvegas is used at least temporarily for 'real' VMs
+#         ('deathvegas', 10),    
          ]  
 
    # vplc01 to 40
@@ -37,20 +38,23 @@ class OnelabSubstrate (Substrate):
 
 # as of jan 2014 this is renumbered so that 1 is preferred
    def qemu_boxes_spec (self):
-      return [ # how many qemus max in this box
-# enfoui - can't seem to enter BIOS on that one
-         ('kvm64-1', 4), # 4 cores, 8Gb
+      return [ # (hostname, how many qemus max in this box)
+# speedball - old school but robust and a big disk
+         ('kvm64-1', 3), # 4 cores, 4Gb, 840 Gb
 # used to have kruder too, but it is broken/dead
 # dorfmeister
          ('kvm64-2', 3), # 4 cores, 4Gb
-# estran - big meme but small disk
-         ('kvm64-3', 2), # 4 cores, 8Gb
+# enfoui - this HP box behaves weird at boot-time
+# we don't get to see much of the boot process
+# use F10 to enter BIOS setup
+# nodes spawned in this box won't get network connectivity
+#         ('kvm64-3', 4), # 4 cores, 8Gb
+# estran - big mem but small disk
+         ('kvm64-4', 2), # 4 cores, 8Gb
 # lodos - rather old/small
-         ('kvm64-4', 1), # 2 cores, 4Gb
-# cyblok         
          ('kvm64-5', 1), # 2 cores, 4Gb
-# we also have speedball installed but it is reserved for manual trials of libvirt/qemu
-#         ('kvm64-6', 3), # 4 cores, 4Gb
+# cyblok         
+         ('kvm64-6', 1), # 2 cores, 4Gb
          ]
 
    # the nodes pool has a MAC address as user-data (3rd elt in tuple)