Changeset 397 for trunk/packages/sipb-xen-console-server/files

Timestamp:

Apr 2, 2008, 4:36:45 AM (17 years ago)

Author:

broder

Message:

Create and destroy conserver consoles through a Python script,
instead of a shell script. Also run this script every 5 minutes or so

Location:

trunk/packages/sipb-xen-console-server/files

Files:

• etc/conserver/conf.d (deleted)
• etc/conserver/conserver.cf.sipb-xen (modified) (1 diff)
• etc/conserver/includes.cf (deleted)
• etc/conserver/sipb-xen-consoles.cf (added)
• usr/sbin/sipb-xen-update-conserver (modified) (1 diff)

trunk/packages/sipb-xen-console-server/files/etc/conserver/conserver.cf.sipb-xen

@@ -24 +24 @@
 }
 
-#include /etc/conserver/includes.cf
+#include /etc/conserver/sipb-xen-consoles.cf
 
 ##

trunk/packages/sipb-xen-console-server/files/usr/sbin/sipb-xen-update-conserver

@@ -1 @@
-#!/bin/bash
+#!/usr/bin/python
 
-ls /etc/conserver/conf.d/ | sed -e 's|^|#include /etc/conserver/conf.d/|' >/etc/conserver/includes.cf
-/etc/init.d/conserver-server reload
+import sipb_xen_database
+import subprocess
+import os
+
+sipb_xen_database.connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
+
+def live_vms():
+    p = subprocess.Popen(['xm', 'list'], stdout=subprocess.PIPE)
+    p.wait()
+    output = p.stdout.read()
+    vms = [x.split()[0][2:] for x in output.splitlines() if x.startswith('d_')]
+    return vms
+
+def reload_conserver():
+    p = subprocess.Popen(['/etc/init.d/conserver-server', 'restart'], stdout=subprocess.PIPE)
+    p.wait()
+
+if __name__ == '__main__':
+    f = open('/etc/conserver/sipb-xen-consoles.cf', 'w')
+    f.write('\n'.join('console %s {}' % vm for vm in live_vms()))
+    f.close()
+    reload_conserver()