Changeset 829 for trunk

Timestamp:

Aug 3, 2008, 12:29:54 AM (16 years ago)

Author:

price

Message:

get db uri from invirt.config in sipb-database

Location:

trunk/packages/sipb-xen-database

Files:

• client/etc/xen/sipb-database (modified) (1 diff)
• config.todo (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• python/database/__init__.py (modified) (1 diff)

trunk/packages/sipb-xen-database/client/etc/xen/sipb-database

@@ -1 +1 @@
 # -*- mode: python; -*-
-import sipb_xen_database.models as models
-from sipb_xen_database import connect
+from invirt.database import models, connect
 import re
 import tempfile
 from subprocess import call
 
-connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
+connect()
 prefix = "d_"
 

trunk/packages/sipb-xen-database/config.todo

@@ -1 @@
-client/etc/xen/sipb-database: db uri
 client/etc/xen/sipb-database: gateway, netmask
 sipb-xen-database-tables: db uri

trunk/packages/sipb-xen-database/debian/changelog

@@ -1 +1 @@
 sipb-xen-database (10.15) unstable; urgency=low
 
-  * uncommitted changes to /etc/xen/sipb-database on black-mesa
+  in /etc/xen/database:
+  * uncommitted changes on black-mesa
+  * sipb_xen_database -> invirt.database
+  * use default db uri
 
- -- Greg Price <price@mit.edu>  Sun,  3 Aug 2008 00:26:13 -0400
+  in invirt.database:
+  * get default db uri from invirt.config
+
+ -- Greg Price <price@mit.edu>  Sun,  3 Aug 2008 00:26:46 -0400
 
 sipb-xen-database (10.14) unstable; urgency=low

trunk/packages/sipb-xen-database/python/database/__init__.py

@@ +1 @@
+from invirt.config import structs as config
 from models import *
 
-def connect(uri):
+def connect(uri = config.db.uri):
     """ Connect to a given database URI"""
     meta.connect(uri)