Changeset 863 for trunk/packages/sipb-xen-www/code/controls.py

Timestamp:

Aug 4, 2008, 10:16:16 PM (16 years ago)

Author:

price

Message:

configurize some web code

File:

• trunk/packages/sipb-xen-www/code/controls.py (modified) (4 diffs)

trunk/packages/sipb-xen-www/code/controls.py

@@ -3 +3 @@
 """
 
-from sipb_xen_database import Machine, Disk, Type, NIC, CDROM, ctx, meta
 import validation
 from webcommon import CodeError, InvalidInput
@@ -14 +13 @@
 import yaml
 
+from invirt.config import structs as config
+from invirt.database import Machine, Disk, Type, NIC, CDROM, ctx, meta
+
 # ... and stolen from xend/uuid.py
 def randomUUID():
@@ -26 +28 @@
 # end stolen code
 
-def kinit(username = 'daemon/sipb-xen.mit.edu', keytab = '/etc/sipb-xen.keytab'):
+def kinit():
     """Kinit with a given username and keytab"""
-
-    p = subprocess.Popen(['kinit', "-k", "-t", keytab, username],
+    p = subprocess.Popen(['kinit', "-k", "-t", '/etc/invirt/keytab',
+                          'daemon/'+config.web.hostname],
                          stderr=subprocess.PIPE)
     e = p.wait()
@@ -47 +49 @@
     """
     checkKinit()
-    p = subprocess.Popen(['remctl', 'remote.mit.edu']
+    p = subprocess.Popen(['remctl', config.remote.hostname]
                          + list(args),
                          stdout=subprocess.PIPE,