finish sipb_xen_database -> invirt.database in web

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

diff --git a/code/controls.py b/code/controls.py
index b4740d4..d4cc13b 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -2,7 +2,6 @@
 Functions to perform remctls.
 """
 
-from sipb_xen_database import Machine, Disk, Type, NIC, CDROM, ctx, meta
 import validation
 from webcommon import CodeError, InvalidInput
 import random
@@ -13,6 +12,9 @@ import re
 import cache_acls
 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():
     """Generate a random UUID."""
@@ -25,10 +27,10 @@ def uuidToString(u):
                      "%02x" * 6]) % tuple(u)
 # 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()
     if e:
@@ -46,7 +48,7 @@ def remctl(*args, **kws):
     kinits if necessary, and outputs errors to stderr.
     """
     checkKinit()
-    p = subprocess.Popen(['remctl', 'remote.mit.edu']
+    p = subprocess.Popen(['remctl', config.remote.hostname]
                          + list(args),
                          stdout=subprocess.PIPE,
                          stderr=subprocess.PIPE)