X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FLocalSubstrate.inria.py;h=49bd51bfb69c272d3179d51aa86aee57a0d1a048;hb=a716dcc59fce208b11b575e3c29651181633adfb;hp=56733452c270ce9fdff704c2a201031cb9aec345;hpb=5e7aa028e662c047334288e1d95b461eb167bc87;p=tests.git

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index 5673345..49bd51b 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 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
@@ -38,20 +39,21 @@ class OnelabSubstrate (Substrate):
 # as of jan 2014 this is renumbered so that 1 is preferred
    def qemu_boxes_spec (self):
       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
+# 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
-# enfoui - can't seem to enter BIOS on that one
-# won't reboot - needs to be fixed
-#         ('kvm64-3', 4), # 4 cores, 8Gb
-# estran - big mem but small disk
-         ('kvm64-4', 2), # 4 cores, 8Gb
-# lodos - rather old/small
-         ('kvm64-5', 1), # 2 cores, 4Gb
-# cyblok         
-         ('kvm64-6', 1), # 2 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)