Add a connect() call to sipb-database and make some changes

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

diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database
index 306cc4e..d70e4e0 100644 (file)
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -1,8 +1,10 @@
 import sipb_xen_database.models as models
 import sipb_xen_database.models as models

+from sipb_xen_database import connect

 
 

-# `name' gets passed in from the xm create call
+connect('postgres://sipb-xen@sipb-vm-1/sipb_xen')
+# `machine_name' should get passed in from the xm create call

 
 

-machine = models.Machine.get_by(name=name)
+machine = models.Machine.get_by(name=machine_name)

 machine_type = models.Type.get_by(type_id=machine.type_id)
 
 memory = machine.memory
 machine_type = models.Type.get_by(type_id=machine.type_id)
 
 memory = machine.memory

diff --git a/debian/changelog b/debian/changelog
index f00e50b..8657164 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sipb-xen-database (3) unstable; urgency=low
+
+  * Add a connect() line to sipb-database
+  * Fix some other bugs in sipb-database
+
+ -- Nelson Elhage <nelhage@mit.edu>  Sun, 19 Aug 2007 19:40:08 -0400
+

 sipb-xen-database (2) unstable; urgency=low
 
   * Fix the postinit and prerm scripts to create a sipb-xen user
 sipb-xen-database (2) unstable; urgency=low
 
   * Fix the postinit and prerm scripts to create a sipb-xen user