From d7f994973d7485f5ef705db2a76058240739a900 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 22 May 2014 12:45:42 +0200
Subject: [PATCH] RAM for test nodes = 1.5 Gb adjust max kvm nodes per box
 accordingly

---
 system/LocalSubstrate.inria.py       | 22 +++++++++++-----------
 system/template-qemu/qemu-start-node |  5 +++--
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index 4ed1547..b414dbb 100755
--- a/system/LocalSubstrate.inria.py
+++ b/system/LocalSubstrate.inria.py
@@ -39,22 +39,22 @@ 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
+# dorfmeister (2)
+         ('dorfmeister', 2), # 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
-# lodos - rather old/small
-         ('kvm64-5', 1), # 2 cores, 4Gb
-# cyblok         
-         ('kvm64-6', 1), # 2 cores, 4Gb
+#         ('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)
diff --git a/system/template-qemu/qemu-start-node b/system/template-qemu/qemu-start-node
index 7198b03..accfbd2 100755
--- a/system/template-qemu/qemu-start-node
+++ b/system/template-qemu/qemu-start-node
@@ -14,8 +14,9 @@ COMMAND=$(basename $0)
 cd $(dirname $0)
 
 ########## globals
-# 2 gigabytes ram
-RAM=2048
+# historically we used 1Gb nodes but with fedora20 bootcd with qemu this is not enough
+# OTOH our test infra is old so 2Gb would be a lot
+RAM=$((1024+512))
 DISK_SIZE=100G
 DISK_FORMAT=qcow2
 DISK_IMAGE=hdd-${DISK_FORMAT}-${DISK_SIZE}.img
-- 
2.43.0