From: Evan Broder Date: Sat, 28 Feb 2009 00:48:30 +0000 (-0500) Subject: Merge invirt-database-server into invirt-database. X-Git-Tag: 0.2.0^0 X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/commitdiff_plain/refs/tags/0.2.0?hp=-c Merge invirt-database-server into invirt-database. I...think this works, but I'm not making any promises. svn path=/trunk/packages/invirt-database/; revision=2218 --- 5d9dbc6ac22ce03205de8ce2246a1774526e84c4 diff --combined debian/changelog index 8d71f91,a13809f..58ee681 --- a/debian/changelog +++ b/debian/changelog @@@ -1,116 -1,73 +1,122 @@@ -invirt-database-server (0.0.11) unstable; urgency=low ++invirt-database (0.2.0) unstable; urgency=low + - * bumped version number to force new owner table creation ++ * Merge invirt-database-server into invirt-database. + - -- Peter A. Iannucci Mon, 16 Feb 2009 23:59:53 -0500 ++ -- Evan Broder Fri, 27 Feb 2009 19:38:55 -0500 + -invirt-database-server (0.0.10) unstable; urgency=low +invirt-database (0.1.9) unstable; urgency=low - [ Greg Price ] - * invirt-database-tables: populate types table + * Make get*Quotas idempotent + * Move Owner import so that Owner can access session in + invirt.database.models - [ Evan Broder ] - * Conditionalize populating the types table on the types not being there - already. + -- Quentin Smith Fri, 27 Feb 2009 14:17:53 -0500 - -- Evan Broder Sat, 31 Jan 2009 03:58:16 -0500 +invirt-database (0.1.8) unstable; urgency=low -invirt-database-server (0.0.9) unstable; urgency=low + [Peter Iannucci] + * Added Record superclass for models, handling __repr__ consistently. - * Add Provides and Conflicts lines to debian/control for - config-package-dev + [Greg Price] + invirt.database.record, .owner: + * use self.c rather than self.__dict__ for SQLAlchemy fields + * make Record._ignore, Owner.get* classmethods + * fold FormattableRecord, NullableRecord into Record + * shorten types in lists to __name__ + + invirt-quota: + * refactor code that sets values + * print full help on no arguments - -- Evan Broder Sat, 24 Jan 2009 20:15:08 -0500 + all: + * make EIBTI imports -invirt-database-server (0.0.8) unstable; urgency=low + [ Quentin Smith ] + * Add "reusable" column for nics, to avoid reusing addresses that are + special in some way. - * pg_hba.conf: remove password-auth localhost lines, which interfere - with the case where config.db.host is localhost. + -- Quentin Smith Fri, 27 Feb 2009 11:51:39 -0500 - -- Greg Price Mon, 29 Dec 2008 00:03:36 -0500 +invirt-database (0.1.7) unstable; urgency=low -invirt-database-server (0.0.7) unstable; urgency=low + * Disk quotas are measured in gibibytes. + * Rename invirt-setquotas to invirt-quota. + * Be explicit about units in invirt-quota. - * Don't depend on invirt-mail-config + -- Evan Broder Tue, 17 Feb 2009 04:29:20 -0500 - -- Evan Broder Thu, 06 Nov 2008 22:49:30 -0500 +invirt-database (0.1.6) unstable; urgency=low -invirt-database-server (0.0.6) unstable; urgency=low + * Move invirt-setquotas into this package. + * Don't explicitly initialize the values for each quota when creating a + new Owner object. - * Depend on invirt-mail-config + -- Evan Broder Tue, 17 Feb 2009 03:44:20 -0500 - -- Evan Broder Thu, 06 Nov 2008 21:47:17 -0500 +invirt-database (0.1.5) unstable; urgency=low -invirt-database-server (0.0.5) unstable; urgency=low + * Make the default values on the owners table explicit + (Note: This is a NOOP, since a nullable field with no otherwise + specified default defaults to NULL) - * Use invoke-rc.d instead of calling init scripts directly + -- Evan Broder Tue, 17 Feb 2009 03:36:47 -0500 - -- Evan Broder Fri, 31 Oct 2008 06:26:30 -0400 +invirt-database (0.1.4) unstable; urgency=low -invirt-database-server (0.0.4) unstable; urgency=low + * minor bug fix - * sipb-xen-base -> invirt-base + -- Peter A. Iannucci Tue, 17 Feb 2009 02:59:14 -0500 - -- Evan Broder Tue, 28 Oct 2008 04:23:20 -0400 +invirt-database (0.1.3) unstable; urgency=low -invirt-database-server (0.0.3) unstable; urgency=low + * Added owner table to database with ram, disk, and VM quotas + * Refactored Owner class into separate sourcefile - * Fix a typo on the postfix.conf.invirt transform script - * Postgres will try to intelligently select a port. We don't want it to - do that - force the port to our standard number + -- Peter A. Iannucci Tue, 17 Feb 2009 01:31:53 -0500 - -- Evan Broder Sat, 25 Oct 2008 21:50:02 -0400 +invirt-database (0.1.2) unstable; urgency=low -invirt-database-server (0.0.2) unstable; urgency=low + * Clean up the .egg-info directory from the right place. - * Catch one dependency that wasn't updated + -- Evan Broder Mon, 05 Jan 2009 23:50:47 -0500 - -- Evan Broder Sat, 25 Oct 2008 21:25:58 -0400 +invirt-database (0.1.1) unstable; urgency=low -invirt-database-server (0.0.1) unstable; urgency=low + * Correct a lintian spelling warning. + + -- Evan Broder Mon, 05 Jan 2009 23:40:44 -0500 + +invirt-database (0.1.0) unstable; urgency=low + + * Turn on lazy loading for all tables + + -- Evan Broder Mon, 17 Nov 2008 21:57:35 -0500 + +invirt-database (0.0.6) unstable; urgency=low + + * Let machines.administrator be NULL + + -- Evan Broder Mon, 17 Nov 2008 13:41:48 -0500 + +invirt-database (0.0.5) unstable; urgency=low + + * Add an architecture field to the autoinstaller table + + -- Evan Broder Mon, 17 Nov 2008 12:18:02 -0500 + +invirt-database (0.0.3) unstable; urgency=low + + * Add attributes to the ORM objects to connect mirrors and cdroms + + -- Evan Broder Tue, 28 Oct 2008 03:16:18 -0400 + +invirt-database (0.0.2) unstable; urgency=low + + * Export mirrors_table and Mirrors from invirt.database.models + + -- Evan Broder Tue, 28 Oct 2008 03:04:54 -0400 + +invirt-database (0.0.1) unstable; urgency=low * sipb-xen-database-common -> invirt-database * sipb-xen-database-server -> invirt-database-server (a separate source package) diff --combined debian/control index f491215,db33198..a3369d7 --- a/debian/control +++ b/debian/control @@@ -1,17 -1,16 +1,28 @@@ -Source: invirt-database-server +Source: invirt-database Section: net Priority: extra Maintainer: Invirt project -Build-Depends: cdbs, debhelper (>= 5), config-package-dev, postgresql-8.3 +Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), - python-all-dev (>=2.3.5-11), python-support (>= 0.5.3), - python-setuptools, python-debian, python-apt ++ config-package-dev, postgresql-8.3, python-all-dev (>=2.3.5-11), ++ python-support (>= 0.5.3), python-setuptools, python-debian, ++ python-apt Standards-Version: 3.8.0 +Package: invirt-database +Architecture: all +Depends: ${misc:Depends}, ${python:Depends}, python-sqlalchemy, + python-psycopg2 +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: Installs the Invirt database schema files + This contains the Python modules to access the Invirt database ++ + Package: invirt-database-server + Architecture: all + Depends: ${misc:Depends}, ${python:Depends}, postgresql-8.3, + python-sqlalchemy, python-psycopg2, invirt-database, adduser, + invirt-base + Provides: ${diverted-files} + Conflicts: ${diverted-files} + Description: Installs the Invirt database server + This tracks all the user VMs and is accessed from the VM host diff --combined debian/invirt-database.install index 0000000,0000000..84cc1ed new file mode 100644 --- /dev/null +++ b/debian/invirt-database.install @@@ -1,0 -1,0 +1,1 @@@ ++debian/tmp/* . diff --combined debian/rules index 89a5fd6,f707006..d2e9b8f --- a/debian/rules +++ b/debian/rules @@@ -1,9 -1,12 +1,18 @@@ #!/usr/bin/make -f +DEB_PYTHON_SYSTEM=pysupport + + DEB_DIVERT_EXTENSION = .invirt + + DEB_TRANSFORM_FILES_invirt-database-server += \ + /etc/postgresql/8.3/main/postgresql.conf.invirt + + DEB_DIVERT_FILES_invirt-database-server += \ + /etc/init.d/postgresql-8.3.invirt + include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/python-distutils.mk + include /usr/share/cdbs/1/rules/config-package.mk + +clean:: + rm -rf invirt.database.egg-info