Changeset 397


Ignore:
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
Files:
2 added
2 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/sipb-xen-console-server/debian/changelog

    r393 r397  
     1sipb-xen-console-server (2) unstable; urgency=low
     2
     3  * Use a python based update-conserver script that gets the list of
     4    consoles from xm list
     5  * Run the update-conserver script every 5 minutes to catch VMs that
     6    are not started or stopped through the remctl interface
     7
     8 -- Evan Broder <broder@sipb-xen-dev.mit.edu>  Wed,  2 Apr 2008 04:32:58 -0400
     9
    110sipb-xen-console-server (1.0.2) unstable; urgency=low
    211
  • trunk/packages/sipb-xen-console-server/files/etc/conserver/conserver.cf.sipb-xen

    r391 r397  
    2424}
    2525
    26 #include /etc/conserver/includes.cf
     26#include /etc/conserver/sipb-xen-consoles.cf
    2727
    2828##
  • trunk/packages/sipb-xen-console-server/files/usr/sbin/sipb-xen-update-conserver

    r386 r397  
    1 #!/bin/bash
     1#!/usr/bin/python
    22
    3 ls /etc/conserver/conf.d/ | sed -e 's|^|#include /etc/conserver/conf.d/|' >/etc/conserver/includes.cf
    4 /etc/init.d/conserver-server reload
     3import sipb_xen_database
     4import subprocess
     5import os
     6
     7sipb_xen_database.connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
     8
     9def live_vms():
     10    p = subprocess.Popen(['xm', 'list'], stdout=subprocess.PIPE)
     11    p.wait()
     12    output = p.stdout.read()
     13    vms = [x.split()[0][2:] for x in output.splitlines() if x.startswith('d_')]
     14    return vms
     15
     16def reload_conserver():
     17    p = subprocess.Popen(['/etc/init.d/conserver-server', 'restart'], stdout=subprocess.PIPE)
     18    p.wait()
     19
     20if __name__ == '__main__':
     21    f = open('/etc/conserver/sipb-xen-consoles.cf', 'w')
     22    f.write('\n'.join('console %s {}' % vm for vm in live_vms()))
     23    f.close()
     24    reload_conserver()
  • trunk/packages/sipb-xen-remctl-auto/debian/changelog

    r386 r397  
     1sipb-xen-remctl-auto (1.0.9) unstable; urgency=low
     2
     3  * Change the way that conserver is updated
     4
     5 -- Evan Broder <broder@sipb-xen-dev.mit.edu>  Wed,  2 Apr 2008 04:36:04 -0400
     6
    17sipb-xen-remctl-auto (1.0.8) unstable; urgency=low
    28
  • trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-vmcontrol

    r386 r397  
    2020    destroy|shutdown)
    2121        xm "$ACTION" "$MACHINE"
    22         rm "/etc/conserver/conf.d/$MACHINE"
    2322        /usr/sbin/sipb-xen-update-conserver
    2423        ;;
     
    4039            xm create sipb-database machine_name="$ORIGMACHINE"
    4140        fi
    42         echo "console $ORIGMACHINE {}" >"/etc/conserver/conf.d/$MACHINE"
    4341        /usr/sbin/sipb-xen-update-conserver
    4442        ;;
Note: See TracChangeset for help on using the changeset viewer.