use remote in web interface

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

diff --git a/code/controls.py b/code/controls.py
index 14ba689..3cf6b1d 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -45,7 +45,7 @@ def remctl(*args, **kws):
     kinits if necessary, and outputs errors to stderr.
     """
     checkKinit()
-    p = subprocess.Popen(['remctl', 'black-mesa.mit.edu']
+    p = subprocess.Popen(['remctl', 'remote.mit.edu']
                          + list(args),
                          stdout=subprocess.PIPE,
                          stderr=subprocess.PIPE)
@@ -91,14 +91,6 @@ def bootMachine(machine, cdtype):
         raise CodeError('"%s" on "control %s create %s' 
                         % (err, machine.name, cdtype))
 
-def registerMachine(machine):
-    """Register a machine to be controlled by the web interface"""
-    remctl('web', 'register', machine.name)
-
-def unregisterMachine(machine):
-    """Unregister a machine to not be controlled by the web interface"""
-    remctl('web', 'unregister', machine.name)
-
 def createVm(owner, contact, name, memory, disk_size, machine_type, cdrom, clone_from):
     """Create a VM and put it in the database"""
     # put stuff in the table
@@ -137,7 +129,6 @@ def createVm(owner, contact, name, memory, disk_size, machine_type, cdrom, clone
     except:
         transaction.rollback()
         raise
-    registerMachine(machine)
     makeDisks(machine)
     if clone_from:
         lvcopy(clone_from, machine, 'password')
@@ -224,7 +215,6 @@ def deleteVM(machine):
         raise
     for mname, dname in delete_disk_pairs:
         remctl('web', 'lvremove', mname, dname)
-    unregisterMachine(machine)
 
 def commandResult(user, fields):
     start_time = 0
@@ -293,5 +283,4 @@ def renameMachine(machine, old_name, new_name):
     for disk in machine.disks:
         remctl("web", "lvrename", old_name, 
                disk.guest_device_name, new_name)
-    remctl("web", "moveregister", old_name, new_name)