From: Evan Broder Date: Sun, 7 Dec 2008 23:53:01 +0000 (-0500) Subject: Merge invirt-remote-host and invirt-remote-server into invirt-remote X-Git-Tag: 0.2.0^0 X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/commitdiff_plain/ccdd1009d00397d0f81fa9a95aa96faf448b9e94?hp=--cc Merge invirt-remote-host and invirt-remote-server into invirt-remote svn path=/trunk/packages/invirt-remote/; revision=1822 --- ccdd1009d00397d0f81fa9a95aa96faf448b9e94 diff --cc debian/changelog index 0f33741,209bb16..d0502bc --- a/debian/changelog +++ b/debian/changelog @@@ -1,260 -1,248 +1,267 @@@ -invirt-remote-host (0.0.9) unstable; urgency=low ++invirt-remote (0.2.0) unstable; urgency=low + - * Use `xm reboot` for reboots instead of a destroy and create ++ * Merge invirt-remote-server and invirt-remote-host into invirt-remote ++ (LP: #305682) + - -- Evan Broder Thu, 20 Nov 2008 10:54:13 -0500 ++ -- Evan Broder Sun, 07 Dec 2008 18:33:59 -0500 + -invirt-remote-host (0.0.8) unstable; urgency=low +invirt-remote-server (0.1.6) unstable; urgency=low - * I know this is the wrong answer, but doing lvchange -a n twice before - deleting an LV tends to make it less likely to error out + * Fix a gen_config -> gen_files - -- Evan Broder Tue, 18 Nov 2008 11:55:22 -0500 + -- Greg Price Sat, 22 Nov 2008 19:27:36 -0500 -invirt-remote-host (0.0.7) unstable; urgency=low +invirt-remote-server (0.1.5) unstable; urgency=low - * Actually remove the unused vmboot remctl + * Fix a typo in calling /lib/init/gen-files.sh - -- Evan Broder Wed, 12 Nov 2008 18:27:48 -0500 + -- Evan Broder Sat, 22 Nov 2008 05:43:06 -0500 -invirt-remote-host (0.0.6) unstable; urgency=low +invirt-remote-server (0.1.4) unstable; urgency=low - * Use invoke-rc.d instead of calling init scripts directly + * Steal some init script ideas from debathena-pyhesiodfs - -- Evan Broder Fri, 31 Oct 2008 06:27:38 -0400 + -- Evan Broder Sat, 22 Nov 2008 05:31:49 -0500 -invirt-remote-host (0.0.5) unstable; urgency=low +invirt-remote-server (0.1.3) unstable; urgency=low - * Add a `remote web vnccert` to print out the VNC certificate + * Switched to using "raw" select expressions instead of using the ORM; + allows the same speed as the old object-based system but without any + caching necessary. - -- Evan Broder Tue, 28 Oct 2008 21:33:28 -0400 + -- Quentin Smith Fri, 21 Nov 2008 04:15:50 -0500 -invirt-remote-host (0.0.4) unstable; urgency=low +invirt-remote-server (0.1.2) unstable; urgency=low - * Fix a typo in invirt-vmcontrol + * Update remctl help with new reboot functionality - -- Evan Broder Tue, 28 Oct 2008 20:11:44 -0400 + -- Evan Broder Thu, 20 Nov 2008 10:57:39 -0500 -invirt-remote-host (0.0.3) unstable; urgency=low +invirt-remote-server (0.1.1) unstable; urgency=low - * Add support for a `remote control vnctoken` remctl for generating a - VNC auth token + * Now that we're doing real caching, cache for less time - -- Evan Broder Tue, 28 Oct 2008 19:47:22 -0400 + -- Evan Broder Mon, 17 Nov 2008 13:18:23 -0500 -invirt-remote-host (0.0.2) unstable; urgency=low +invirt-remote-server (0.1.0) unstable; urgency=low - * sipb-database -> invirt-database + * Add real caching to remconffs - -- Evan Broder Sat, 25 Oct 2008 18:05:17 -0400 + -- Evan Broder Mon, 17 Nov 2008 13:05:32 -0500 -invirt-remote-host (0.0.1) unstable; urgency=low +invirt-remote-server (0.0.18) unstable; urgency=low - * sipb-xen-remctl-auto -> invirt-remote-host + * Add a "help" command for the control remctl - -- Evan Broder Fri, 24 Oct 2008 21:54:35 -0400 + -- Evan Broder Sat, 15 Nov 2008 19:02:19 -0500 -sipb-xen-remctl-auto (1.5.2) unstable; urgency=low +invirt-remote-server (0.0.17) unstable; urgency=low - * sipb-xen-console-server -> invirt-console-host + * Get the host with the most RAM based on the maximum recoverable + memory, not the memory currently available to Xen - -- Greg Price Fri, 24 Oct 2008 01:43:15 -0400 + -- Evan Broder Sat, 15 Nov 2008 10:30:10 -0500 -sipb-xen-remctl-auto (1.5.1) unstable; urgency=low +invirt-remote-server (0.0.16) unstable; urgency=low - * Return the new invalid-command error code in sipb-xen-vmcontrol + * When returning from a bcast, put together the stdout, not the stderr - -- Evan Broder Wed, 22 Oct 2008 00:51:34 -0400 + -- Evan Broder Mon, 10 Nov 2008 16:19:33 -0500 -sipb-xen-remctl-auto (1.5) unstable; urgency=low +invirt-remote-server (0.0.15) unstable; urgency=low - * Distinguish between Xen errors and invalid commands by returning a - completely outlandish error code that's not likely to conflict with - anything + * Include invirt.remote Python module + * Ignore erroneous responses from a server if it's because the server is + down - -- Evan Broder Wed, 22 Oct 2008 00:47:50 -0400 + -- Evan Broder Mon, 10 Nov 2008 15:19:28 -0500 -sipb-xen-remctl-auto (1.4) unstable; urgency=low +invirt-remote-server (0.0.14) unstable; urgency=low - * Correctly extract the CDROM image from the remctl arguments + * Don't depend on invirt-mail-config - -- Evan Broder Sat, 18 Oct 2008 17:19:57 -0400 + -- Evan Broder Thu, 06 Nov 2008 22:51:19 -0500 -sipb-xen-remctl-auto (1.3.1) unstable; urgency=low +invirt-remote-server (0.0.13) unstable; urgency=low - * Quote the installer arguments correctly + * Depend on invirt-mail-config - -- Evan Broder Fri, 10 Oct 2008 01:47:54 -0400 + -- Evan Broder Thu, 06 Nov 2008 21:49:27 -0500 -sipb-xen-remctl-auto (1.3) unstable; urgency=low +invirt-remote-server (0.0.12) unstable; urgency=low - * Respond to remctl install requests by passing the options onto Xen + * shorten initscript with std-init, correct the usage message - -- Evan Broder Thu, 09 Oct 2008 01:57:30 -0400 + -- Greg Price Wed, 05 Nov 2008 19:59:18 -0500 -sipb-xen-remctl-auto (1.2) unstable; urgency=low +invirt-remote-server (0.0.11) unstable; urgency=low - * Exit successfully if inetd is already running; package fails to - install otherwise + * Don't proxy requests for the VNC cert if the requested hostname isn't + an Invirt host - -- Evan Broder Mon, 06 Oct 2008 05:03:18 -0400 + -- Evan Broder Tue, 28 Oct 2008 23:17:10 -0400 -sipb-xen-remctl-auto (1.1) unstable; urgency=low +invirt-remote-server (0.0.10) unstable; urgency=low - * Explicitly lock a volume before deleting it + * All remctls of type 'web' have the same ACL - glob them together - -- Evan Broder Sun, 05 Oct 2008 18:01:34 -0400 + -- Evan Broder Tue, 28 Oct 2008 23:05:42 -0400 -sipb-xen-remctl-auto (1.0.21) unstable; urgency=low +invirt-remote-server (0.0.9) unstable; urgency=low - * start inetd too in init script + * Add support for a `web vnccert` remctl call - -- Greg Price Wed, 01 Oct 2008 20:43:29 -0400 + -- Evan Broder Tue, 28 Oct 2008 22:45:29 -0400 -sipb-xen-remctl-auto (1.0.20) unstable; urgency=low +invirt-remote-server (0.0.8) unstable; urgency=low - * generate config files using mako + * sipb-xen-base -> invirt-base - -- Yang Zhang Thu, 14 Aug 2008 15:18:46 -0400 + -- Evan Broder Tue, 28 Oct 2008 04:23:32 -0400 -sipb-xen-remctl-auto (1.0.19) unstable; urgency=low +invirt-remote-server (0.0.7) unstable; urgency=low - * simplify the init script a la sipb-xen-dev + * sipb-xen-database-common -> invirt-database - -- Yang Zhang Thu, 7 Aug 2008 22:09:28 -0400 + -- Evan Broder Sat, 25 Oct 2008 21:03:13 -0400 -sipb-xen-remctl-auto (1.0.18) unstable; urgency=low +invirt-remote-server (0.0.6) unstable; urgency=low - * use invirt config in sipb-xen-lvm - * added .init script to generate /etc/remctl/acl/remote - * sipb_xen_database -> invirt.database + * Remove dependency on sipb-xen-chrony-config - we need to take care of + the clock, but chrony isn't the right answer - -- Yang Zhang Sun, 3 Aug 2008 00:46:28 -0400 + -- Evan Broder Sat, 25 Oct 2008 19:16:08 -0400 -sipb-xen-remctl-auto (1.0.17) unstable; urgency=low +invirt-remote-server (0.0.5) unstable; urgency=low - * catch another version of the xenstore error in the listvms race + * Rename a remaining sipb-xen file to invirt - -- Greg Price Wed, 23 Jul 2008 01:12:01 -0400 + -- Evan Broder Fri, 24 Oct 2008 22:21:30 -0400 -sipb-xen-remctl-auto (1.0.16) unstable; urgency=low +invirt-remote-server (0.0.4) unstable; urgency=low - * support YAML as well as JSON (broder, quentin, andersk, long ago) - * fix a race in listvms when a machine is shutting down + * Kill DEB_AUTO_UPDATE_DEBIAN_CONTROL - -- Greg Price Tue, 22 Jul 2008 23:46:49 -0400 + -- Evan Broder Fri, 24 Oct 2008 13:49:45 -0400 -sipb-xen-remctl-auto (1.0.15) unstable; urgency=low +invirt-remote-server (0.0.3) unstable; urgency=low - * Compute time differences on server to avoid drift + * Standardize on "Invirt project" - -- Quentin Smith Thu, 15 May 2008 20:58:04 -0400 + -- Evan Broder Fri, 24 Oct 2008 13:33:25 -0400 -sipb-xen-remctl-auto (1.0.14) unstable; urgency=low +invirt-remote-server (0.0.2) unstable; urgency=low - * Use more efficient python API to get VM information, and return it - in a Python dict structure. + * oops, update control from control.in + * configurize web acl - -- Quentin Smith Thu, 15 May 2008 20:29:03 -0400 + -- Greg Price Fri, 24 Oct 2008 00:28:08 -0400 -sipb-xen-remctl-auto (1.0.13) unstable; urgency=low +invirt-remote-server (0.0.1) unstable; urgency=low - * Switch to just using the remote server. + * sipb-xen -> invirt - -- Greg Price Sat, 10 May 2008 21:26:42 -0400 + -- Greg Price Thu, 23 Oct 2008 23:58:36 -0400 -sipb-xen-remctl-auto (1.0.12) unstable; urgency=low +sipb-xen-remote-server (0.10.2) unstable; urgency=low - * Remove an obsolete line from the remctl config. + * There's a race condition for if the VM gets powered off between the + listvms and the actual request. Solve the problem correctly by using a + non-conflicting error code to indicate an invalid command - -- Greg Price Sun, 4 May 2008 22:36:07 -0400 + -- Evan Broder Wed, 22 Oct 2008 00:46:38 -0400 -sipb-xen-remctl-auto (1.0.11) unstable; urgency=low +sipb-xen-remote-server (0.10.1) unstable; urgency=low - * Close file descriptors for update-conserver on destroy/shutdown. + * Make both list-host and listhost valid commands, and for parity with + list-long, document list-host - -- Eric Price Mon, 21 Apr 2008 21:28:12 -0400 + -- Evan Broder Wed, 22 Oct 2008 00:36:32 -0400 -sipb-xen-remctl-auto (1.0.10) unstable; urgency=low +sipb-xen-remote-server (0.10) unstable; urgency=low - * Delay running sipb-xen-update-conserver + * If a command is invalid, but the machine's on, give an actually useful + error message - -- Evan Broder Mon, 21 Apr 2008 20:26:28 -0400 + -- Evan Broder Wed, 22 Oct 2008 00:29:50 -0400 -sipb-xen-remctl-auto (1.0.9) unstable; urgency=low +sipb-xen-remote-server (0.9.2) unstable; urgency=low - * Change the way that conserver is updated + * Expose an interface to the autoinstaller over remctl + * Validate options to be passed to the autoinstaller on the remctl + server - -- Evan Broder Wed, 2 Apr 2008 04:36:04 -0400 + -- Evan Broder Thu, 09 Oct 2008 02:06:00 -0400 -sipb-xen-remctl-auto (1.0.8) unstable; urgency=low +sipb-xen-remote-server (0.9.1) unstable; urgency=low - * Add support for updating conserver when VMs are turned on and off + * Fix a bug in the database handling code - -- Evan Broder Wed, 2 Apr 2008 00:40:23 -0400 + -- Evan Broder Fri, 03 Oct 2008 18:42:48 -0400 -sipb-xen-remctl-auto (1.0.7) unstable; urgency=low +sipb-xen-remote-server (0.9) unstable; urgency=low - * changes for installer system + [Evan Broder] + * Make the acl/ subdir of RemConfFS listable + + [Greg Price] + * Update RemConfFS for new SQLAlchemy code - -- Tim Abbott Sun, 28 Oct 2007 22:47:59 -0400 + -- Evan Broder Wed, 01 Oct 2008 19:28:23 -0400 -sipb-xen-remctl-auto (1.0.6) unstable; urgency=low +sipb-xen-remote-server (0.8) unstable; urgency=low - * get rid of old "vmboot" call - * make "create" not destroy running machines. + * Use RouteFS for RemConfFS - -- Tim Abbott Sat, 27 Oct 2007 16:54:26 -0400 + -- Evan Broder Wed, 01 Oct 2008 02:21:00 -0400 -sipb-xen-remctl-auto (1.0.5) unstable; urgency=low +sipb-xen-remote-server (0.7) unstable; urgency=low - * move to common /usr/sbin/sipb-xen-* naming - * get rid of dispatch.sh hack - * fix "reboot" to "destroy then create" always, since that's what users will expect - * change remctl calls interface in various ways + * depend on sipb-xen-base - -- Tim Abbott Tue, 16 Oct 2007 00:28:36 -0400 + -- Greg Price Tue, 30 Sep 2008 20:47:05 -0400 -sipb-xen-remctl-auto (1.0.4) unstable; urgency=low +sipb-xen-remote-server (0.6) unstable; urgency=low - * Fix typos. + * sipb_xen_database -> invirt.config - -- Anders Kaseorg Tue, 9 Oct 2007 04:47:37 -0400 + -- Yang Zhang Sun, 3 Aug 2008 00:54:59 -0400 -sipb-xen-remctl-auto (1.0.3) unstable; urgency=low +sipb-xen-remote-server (0.5) unstable; urgency=low - * Prepend d_ to database VMs. + * use invirt config in sipb-xen-remconffs, sipb-xen-remctl-help, + sipb-xen-remote-proxy - -- Eric Price Tue, 9 Oct 2007 02:34:56 -0400 + -- Yang Zhang Sun, 3 Aug 2008 00:32:59 -0400 -sipb-xen-remctl-auto (1.0.2) unstable; urgency=low +sipb-xen-remote-server (0.4) unstable; urgency=low - * Added web interface support code. - * Move things from /etc/remctl/sipb-xen-auto/bin to /usr/sbin - * Quoted lots of variables + * use invirt.config to get hostnames + * refactoring: extracted bcast() function into invirt.remote package - -- Tim Abbott Sun, 7 Oct 2007 17:23:40 -0400 + -- Yang Zhang Sat, 2 Aug 2008 20:34:50 -0400 -sipb-xen-remctl-auto (1.0.1) unstable; urgency=low +sipb-xen-remote-server (0.3) unstable; urgency=low - * Stop scaring me with unquoted variables. + * Fill in all the code to make the package work (mostly weeks ago.) + * sipb-xen-remote-listvms aggregates listvms across hosts (with + y_z, broder, andersk) + * sipb-xen-remctl-help gives help + * sipb-xen-remote-control proxies to where a machine is running + * sipb-xen-remote-create chooses where to boot by load-balancing - -- Anders Kaseorg Sun, 05 Aug 2007 22:11:02 -0400 + -- Greg Price Thu, 24 Jul 2008 21:34:20 -0400 -sipb-xen-remctl-auto (1.0) unstable; urgency=low +sipb-xen-remote-server (0.2) unstable; urgency=low - * Initial release. + * FUSE filesystem for remctl configuration. + * Remove *register calls, since the FUSE keeps things up to date. + * An init script to keep the FUSE fs up. - -- Tim Abbott Sun, 15 Jul 2007 19:37:05 -0400 + -- Greg Price Sat, 10 May 2008 22:04:32 -0400 + +sipb-xen-remote-server (0.1) unstable; urgency=low + + * First draft. + + -- Greg Price Sun, 30 Mar 2008 01:08:50 -0400 diff --cc debian/control index 51de82e,0700a91..50e6222 --- a/debian/control +++ b/debian/control @@@ -1,20 -1,14 +1,28 @@@ - Source: invirt-remote-server -Source: invirt-remote-host -Section: net -Priority: extra ++Source: invirt-remote +Section: servers +Priority: important Maintainer: Invirt project -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0) +Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), + 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-remote-server +Architecture: all +Provides: ${diverted-files}, ${python:Provides} +Conflicts: ${diverted-files} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, + daemon, debathena-kerberos-config, fuse-utils, openssh-server, + python-routefs, invirt-database, invirt-base, remctl-server, + remctl-client +XB-Python-Version: ${python:Versions} +Description: Invirt remote-control server + This package should be installed to set up the remote-control server. ++ + Package: invirt-remote-host + Architecture: all + Depends: ${misc:Depends}, remctl-server, invirt-console-host, + invirt-vnc-server, python-cjson, python-yaml + Description: Installs the Invirt host remctl configuration + This is the remctl configuration for an Invirt host. It allows any + commands to be run from the Invirt remote server diff --cc debian/invirt-remote-host.install index 0000000,9da31b3..260c50b mode 000000,100644..100644 --- a/debian/invirt-remote-host.install +++ b/debian/invirt-remote-host.install @@@ -1,0 -1,1 +1,1 @@@ -files/* . ++host/* . diff --cc debian/invirt-remote-server.install index 9da31b3,0000000..bde7702 mode 100644,000000..100644 --- a/debian/invirt-remote-server.install +++ b/debian/invirt-remote-server.install @@@ -1,1 -1,0 +1,2 @@@ - files/* . ++server/* . ++debian/tmp/* . diff --cc host/etc/remctl/acl/remote.mako index 0000000,8a223ff..8a223ff mode 000000,100644..100644 --- a/host/etc/remctl/acl/remote.mako +++ b/host/etc/remctl/acl/remote.mako diff --cc host/etc/remctl/conf.d/invirt-remote-host index 0000000,b62acac..b62acac mode 000000,100644..100644 --- a/host/etc/remctl/conf.d/invirt-remote-host +++ b/host/etc/remctl/conf.d/invirt-remote-host diff --cc host/usr/sbin/invirt-listvms index 0000000,890931a..890931a mode 000000,100755..100755 --- a/host/usr/sbin/invirt-listvms +++ b/host/usr/sbin/invirt-listvms diff --cc host/usr/sbin/invirt-lvm index 0000000,6367216..6367216 mode 000000,100755..100755 --- a/host/usr/sbin/invirt-lvm +++ b/host/usr/sbin/invirt-lvm diff --cc host/usr/sbin/invirt-remote index 0000000,8511f60..8511f60 mode 000000,100755..100755 --- a/host/usr/sbin/invirt-remote +++ b/host/usr/sbin/invirt-remote diff --cc host/usr/sbin/invirt-vmcontrol index 0000000,70bff12..70bff12 mode 000000,100755..100755 --- a/host/usr/sbin/invirt-vmcontrol +++ b/host/usr/sbin/invirt-vmcontrol diff --cc server/etc/remctl/acl/web.mako index 4a320c8,0000000..4a320c8 mode 100644,000000..100644 --- a/server/etc/remctl/acl/web.mako +++ b/server/etc/remctl/acl/web.mako diff --cc server/etc/remctl/conf.d/invirt-web index af81d8a,0000000..af81d8a mode 100644,000000..100644 --- a/server/etc/remctl/conf.d/invirt-web +++ b/server/etc/remctl/conf.d/invirt-web diff --cc server/etc/remctl/conf.d/remconffs index 0bda904,0000000..0bda904 mode 100644,000000..100644 --- a/server/etc/remctl/conf.d/remconffs +++ b/server/etc/remctl/conf.d/remconffs diff --cc server/usr/sbin/invirt-remconffs index 6389391,0000000..6389391 mode 100755,000000..100755 --- a/server/usr/sbin/invirt-remconffs +++ b/server/usr/sbin/invirt-remconffs diff --cc server/usr/sbin/invirt-remctl-help index 33c67a6,0000000..33c67a6 mode 100755,000000..100755 --- a/server/usr/sbin/invirt-remctl-help +++ b/server/usr/sbin/invirt-remctl-help diff --cc server/usr/sbin/invirt-remote-control index b205760,0000000..b205760 mode 100755,000000..100755 --- a/server/usr/sbin/invirt-remote-control +++ b/server/usr/sbin/invirt-remote-control diff --cc server/usr/sbin/invirt-remote-create index 0a95d35,0000000..0a95d35 mode 100755,000000..100755 --- a/server/usr/sbin/invirt-remote-create +++ b/server/usr/sbin/invirt-remote-create diff --cc server/usr/sbin/invirt-remote-listhost index 64f6edf,0000000..64f6edf mode 100755,000000..100755 --- a/server/usr/sbin/invirt-remote-listhost +++ b/server/usr/sbin/invirt-remote-listhost diff --cc server/usr/sbin/invirt-remote-listvms index 8c25d09,0000000..8c25d09 mode 100755,000000..100755 --- a/server/usr/sbin/invirt-remote-listvms +++ b/server/usr/sbin/invirt-remote-listvms diff --cc server/usr/sbin/invirt-remote-listvmsd index 33acef3,0000000..33acef3 mode 100755,000000..100755 --- a/server/usr/sbin/invirt-remote-listvmsd +++ b/server/usr/sbin/invirt-remote-listvmsd diff --cc server/usr/sbin/invirt-remote-proxy index f05fa65,0000000..f05fa65 mode 100755,000000..100755 --- a/server/usr/sbin/invirt-remote-proxy +++ b/server/usr/sbin/invirt-remote-proxy diff --cc server/usr/sbin/invirt-remote-proxy-control index 215b1de,0000000..215b1de mode 120000,000000..120000 --- a/server/usr/sbin/invirt-remote-proxy-control +++ b/server/usr/sbin/invirt-remote-proxy-control diff --cc server/usr/sbin/invirt-remote-proxy-web index 215b1de,0000000..215b1de mode 120000,000000..120000 --- a/server/usr/sbin/invirt-remote-proxy-web +++ b/server/usr/sbin/invirt-remote-proxy-web diff --cc server/usr/sbin/invirt-remote-vnccert index 019256a,0000000..019256a mode 100755,000000..100755 --- a/server/usr/sbin/invirt-remote-vnccert +++ b/server/usr/sbin/invirt-remote-vnccert