Get tokens for a cell before getting a list membership from that cell.

[invirt/packages/invirt-web.git] / code / main.py

diff --git a/code/main.py b/code/main.py
index b0f6674..8a5e001 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -201,8 +201,7 @@ def getListDict(username, state):
     checkpoint.checkpoint('Got max mem/disk')
     defaults = Defaults(max_memory=max_memory,
                         max_disk=max_disk,
-                        owner=username,
-                        cdrom='gutsy-i386')
+                        owner=username)
     checkpoint.checkpoint('Got defaults')
     def sortkey(machine):
         return (machine.owner != username, machine.owner, machine.name)
@@ -450,7 +449,12 @@ ParaVM machines rely on a modified kernel to communicate directly with
 the hypervisor.  HVMs support boot CDs of any operating system, and
 the VNC console applet.  The three-minute autoinstaller produces
 ParaVMs.  ParaVMs typically are more efficient, and always support the
-console server.</p>
+<a href="help?subject=ParaVM+Console">console server</a>.</p>
+
+<p>More details are <a
+href="https://xvm.scripts.mit.edu/wiki/Paravirtualization">on the
+wiki</a>, including steps to prepare an HVM guest to boot as a ParaVM
+(which you can skip by using the autoinstaller to begin with.)</p>
 
 <p>We recommend using a ParaVM when possible and an HVM when necessary.
 """,
@@ -677,7 +681,7 @@ def getUser(environ):
     
     if environ.get('AUTH_TYPE') == 'Negotiate':
         # Convert the krb5 principal into a krb4 username
-        if not user.endswith('@%s' % config.authn[0].realm):
+        if not user.endswith('@%s' % config.kerberos.realm):
             return
         else:
             return user.split('@')[0].replace('/', '.')