X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FLocalSubstrate.inria.py;h=9181ce25ecfcf29cfa72fd0c4f7dab170f9caa12;hb=fa7a8e245c076e3295122409f2eff7d13844be4d;hp=f595e72ed4e1b28f3de81fab5480da6e9d423ba2;hpb=207adc2c5560dc5394d03439b25fb14c0a12d7bb;p=tests.git

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index f595e72..9181ce2 100755
--- a/system/LocalSubstrate.inria.py
+++ b/system/LocalSubstrate.inria.py
@@ -18,24 +18,16 @@ class OnelabSubstrate (Substrate):
    def test_box_spec (self):
       return 'testmaster'
 
-   # the build boxes we use 
-   def build_vs_boxes_spec (self):
-      return [ 'liquid', 'reed', 'velvet' ]
-
    # the experimental lxc-based build box
    def build_lxc_boxes_spec (self):
-      return [ 'warhol' ]
-
-   # the vs-capable box for PLCs
-   def plc_vs_boxes_spec (self):
-      return [ ]
+      return [ 'liquid', 'reed', 'velvet' ]
 
    # the lxc-capable box for PLCs
    def plc_lxc_boxes_spec (self):
       return [ 
-# gotan has fsck issues and is being reinstalled under f20
-#         ('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
@@ -44,15 +36,25 @@ class OnelabSubstrate (Substrate):
                   'unused')                     # MAC address 
                 for i in range(1,41) ] 
 
+# 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 runs f18 - also can't seem to enter BIOS on that one
-         ('kvm64-6', 4), # 4 cores, 8Gb
-# this one is down         ('kvm64-1', 3), # 4 cores, 4Gb
+      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
+# 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
-         ('kvm64-3', 1), # 2 cores, 4Gb
+# lodos - rather old/small
          ('kvm64-5', 1), # 2 cores, 4Gb
+# cyblok         
+         ('kvm64-6', 1), # 2 cores, 4Gb
          ]
 
    # the nodes pool has a MAC address as user-data (3rd elt in tuple)