Configure the website to use the new autoinstaller code

svn path=/trunk/packages/sipb-xen-www/; revision=1096

diff --git a/code/controls.py b/code/controls.py
index 86c23c2..9f5bc48 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -78,10 +78,13 @@ def getswap(disksize, memsize):
 def lvinstall(machine, autoinstall):
     disksize = machine.disks[0].size
     memsize = machine.memory
 def lvinstall(machine, autoinstall):
     disksize = machine.disks[0].size
     memsize = machine.memory

-    imagesize = disksize - getswap(disksize, memsize)
+    swapsize = getswap(disksize, memsize)
+    imagesize = disksize - swapsize

     ip = machine.nics[0].ip
     ip = machine.nics[0].ip

-    remctl('web', 'install', machine.name, autoinstall.distribution,
-           autoinstall.mirror, str(imagesize), ip)
+    remctl('control', machine.name, 'install', 
+           'dist=%s' % autoinstall.distribution,
+           'mirror=%s' % autoinstall.mirror,
+           'imagesize=%s' % imagesize)

 
 def lvcopy(machine_orig_name, machine, rootpw):
     """Copy a golden image onto a machine's disk"""
 
 def lvcopy(machine_orig_name, machine, rootpw):
     """Copy a golden image onto a machine's disk"""