1) reworking of lvm stuff into a single python script rather than a pile of shell...

2) changing naming for database VMs to always start with d_

svn path=/trunk/packages/sipb-xen-database/sipb-xen-database/; revision=146

diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database
index 164cef0..54c1b74 100644 (file)
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -4,6 +4,7 @@ from sipb_xen_database import connect
 import re
 
 connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
+prefix = "d_"
 
 # 'machine_name', and optionally 'cdrom_image', should get passed in
 # from the xm create call
@@ -20,7 +21,7 @@ machine_type = models.Type.get_by(type_id=machine.type_id)
 memory = machine.memory
 maxmem = memory
 check(re.match('^[A-Za-z0-9][A-Za-z0-9._-]*$', machine.name))
-name = machine.name
+name = prefix + machine.name
 check(re.match('^[0-9a-f-]+$', machine.uuid))
 uuid = machine.uuid
 
@@ -58,7 +59,7 @@ disk = []
 
 for d in machine.disks:
     check(re.match('^[A-Za-z0-9]+$', d.guest_device_name))
-    device = '/dev/xenvg/' + machine.name + '_' + d.guest_device_name
+    device = '/dev/xenvg/' + prefix + machine.name + '_' + d.guest_device_name
     dspec = 'phy:%s,%s%s,w' % (device, diskioemu, d.guest_device_name)
     disk.append(dspec)