Rearrange the machine table to accomodate per-VM hosts and memory

diff --git a/scripts-server b/scripts-server
index 67248b41d46568015f645e77a75b35e36accf432..7f1bd100590a17b01561618d85dcfa52a1b8de18 100644 (file)
--- a/scripts-server
+++ b/scripts-server
@@ -8,11 +8,18 @@
 # set install=fcX if you want to run a Fedora install, where X
 # is the version of Fedora to install
 
-macs = { 'bees-knees'   : 10,
-         'cats-whiskers': 20,
-         'not-backward' : 30,
-       }
-mac5 = macs[machine_name]
+vm_host = 0
+vm_mem  = 1
+vm_mac5 = 2
+machines = { 'bees-knees'   : ['not-forward',  4096, 10],
+             'cats-whiskers': ['not-forward',  4096, 20],
+             'not-backward' : ['not-forward',  4096, 30],
+             'busy-beaver'  : ['conan-obrien', 3072, 40],
+             'pancake-bunny': ['conan-obrien', 3072, 50],
+           }
+vm = machines[machine_name]
+
+mac5 = vm[vm_mac5]
 
 if 'install' in locals():
   # Get these files from a Fedora mirror, from a path like
@@ -29,10 +36,10 @@ else:
   bootloader = "/usr/bin/pygrub"
 
 vcpus = 2
-if 'memory' not in locals(): memory = 4096
+if 'memory' not in locals(): memory = vm[vm_mem]
 maxmem = 16384
 name = machine_name
-vg = "not-forward"
+vg = vm[vm_host]
 disk = [i % (vg, name) for i in ['phy:/dev/%s/%s-root,hda,w',
                                  'phy:/dev/%s/%s-swap,hdb,w']]
 vif = [i % mac5 for i in ['bridge=eth0, mac=ac:de:48:00:%s:01',