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

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index a5a39eb..0dd47a1 100755
--- a/system/LocalSubstrate.inria.py
+++ b/system/LocalSubstrate.inria.py
@@ -20,13 +20,16 @@ class OnelabSubstrate (Substrate):
 
    # the experimental lxc-based build box
    def build_lxc_boxes_spec (self):
-      return [ 'liquid', 'reed', 'velvet' ]
+# velvet needs attention
+#      return [ 'liquid', 'reed', 'velvet' ]
+      return [ 'liquid', 'reed' ]
 
    # 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 looks in bad shape and I can't use its drac from the US
+#         ('gotan', 20),         # how many plcs max in this box 
+         ('deathvegas', 12),    
          ]  
 
    # vplc01 to 40
@@ -37,20 +40,22 @@ 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 (1) - old school but robust and a big disk
+         ('speedball', 2), # 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
-# 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
+# dorfmeister (2)
+         ('dorfmeister', 2), # 4 cores, 4Gb
+# enfoui - L119 as it won't work well under the KVM in L102A
+# use F10 to enter BIOS setup
+# nodes spawned in this box won't get network connectivity
+#         ('enfoui', 4), # 4 cores, 8Gb
+# estran (4) - big mem but small disk
+         ('estran', 3), # 4 cores, 8Gb
+# lodos (5) - rather old/small
+         ('lodos', 1), # 2 cores, 4Gb
+# cyblok (6)        
+         ('cyblok', 1), # 2 cores, 4Gb
          ]
 
    # the nodes pool has a MAC address as user-data (3rd elt in tuple)