From: Steven Valdez Date: Fri, 19 Jul 2013 17:25:52 +0000 (-0400) Subject: Merged internal_ips change X-Git-Tag: 0.0.40~1 X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-xen-config.git/commitdiff_plain/7ba21cb807684b4773aa497b7c654d1ed7d68bfb?hp=d738713d80b9edf37b3e51d75cb4cc6e1376fdb2 Merged internal_ips change --- diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..a82703f --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ +all: xend-config.sxp.invirt.mako + +xend-config.sxp.invirt.mako: + ./templatize-xend-config < /etc/xen/xend-config.sxp > $@ + +clean: + rm -f xend-config.sxp.invirt.mako + +.PHONY: clean diff --git a/debian/changelog b/debian/changelog index 7a6195c..49474f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,114 @@ -invirt-xen-config (0.0.38) unstable; urgency=low +invirt-xen-config (0.0.39) unstable; urgency=low * Treat config.hosts.internal_ips as an array -- Peter Iannucci Mon, 01 Jul 2013 21:51:00 -0400 +invirt-xen-config (0.0.38~glasgall15) precise; urgency=low + + * Teach qemu-dm-invirt that /usr/lib/xen moved to /usr/lib/xen-4.1 + + -- Adam Glasgall Thu, 06 Jun 2013 21:36:37 -0400 + +invirt-xen-config (0.0.38~glasgall14achernya1) precise; urgency=low + + * Switch to dh7 + * Bump standards version + + -- Alexander Chernyakhovsky Fri, 31 May 2013 21:16:20 -0400 + +invirt-xen-config (0.0.38~glasgall14) precise; urgency=low + + * /usr/lib/xen moved to /usr/lib/xen-4.1. teach invirt-database this. + + -- Adam Glasgall Wed, 08 May 2013 00:06:25 -0400 + +invirt-xen-config (0.0.38~glasgall13) precise; urgency=low + + * Undo enabling network-bridge; we want to manage our own bridge config + now. Oh, irony. + + -- Adam Glasgall Mon, 06 May 2013 19:14:41 -0400 + +invirt-xen-config (0.0.38~glasgall12) precise; urgency=low + + * xm was expecting a string and was getting a unistring for machine + name, which resulted in the VM name always being + 'invirt-database'. Use passed-in machine_name instead, since that will + be a string. IBTSOCS. + + -- Adam Glasgall Mon, 06 May 2013 19:14:23 -0400 + +invirt-xen-config (0.0.38~glasgall11) precise; urgency=low + + * Add dependency on ethtool. + + -- Adam Glasgall Fri, 26 Apr 2013 22:36:10 -0400 + +invirt-xen-config (0.0.38~glasgall10) precise; urgency=low + + * SQLAlchemy API updates in invirt-database xen config + + -- Adam Glasgall Fri, 26 Apr 2013 21:14:25 -0400 + +invirt-xen-config (0.0.38~glasgall9) precise; urgency=low + + * _really_ correct regexp this time. + + -- Adam Glasgall Sat, 13 Apr 2013 17:57:11 -0400 + +invirt-xen-config (0.0.38~glasgall8) precise; urgency=low + + * fix typo in regexp + + -- Adam Glasgall Sat, 13 Apr 2013 17:49:08 -0400 + +invirt-xen-config (0.0.38~glasgall7) precise; urgency=low + + * Correct regexp in s/// over xend-config.sxp + + -- Adam Glasgall Sat, 13 Apr 2013 17:46:43 -0400 + +invirt-xen-config (0.0.38~glasgall6) precise; urgency=low + + * Enable network-bridge in xend-config.sxp, since Precise doesn't by + default anymore. + + -- Adam Glasgall Sat, 13 Apr 2013 17:40:33 -0400 + +invirt-xen-config (0.0.38~glasgall5) precise; urgency=low + + * s/// out the "${XEN_CONFIG_DIR}" reference that was making mako choke + + -- Adam Glasgall Sun, 24 Mar 2013 20:31:31 -0400 + +invirt-xen-config (0.0.38~glasgall4) precise; urgency=low + + * Oops, no, we don't actually want to uninstall grub. Depend on grub-pc + instead. + + -- Adam Glasgall Sun, 24 Mar 2013 17:49:24 -0400 + +invirt-xen-config (0.0.38~glasgall3) precise; urgency=low + + * ubuntu-xen-server bit the dust several releases ago. replace it by + explicitly listing the xen bits we need in Depends. + + -- Adam Glasgall Sun, 24 Mar 2013 17:44:24 -0400 + +invirt-xen-config (0.0.38~glasgall2) precise; urgency=low + + * Bump xen-utils dependency + * Update xend-config.sxp transformer for newer default config + + -- Adam Glasgall Sun, 24 Mar 2013 17:37:05 -0400 + +invirt-xen-config (0.0.38~glasgall1) precise; urgency=low + + * Bump version for precise + + -- Adam Glasgall Thu, 21 Mar 2013 23:24:57 -0700 + invirt-xen-config (0.0.37) unstable; urgency=low * Support multiple NICs on HVMs. diff --git a/debian/compat b/debian/compat index b8626c4..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +7 diff --git a/debian/control b/debian/control index 5eaa02b..3bb1dd0 100644 --- a/debian/control +++ b/debian/control @@ -2,14 +2,15 @@ Source: invirt-xen-config Section: base Priority: extra Maintainer: Invirt project -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), config-package-dev, xen-utils-3.2 | xen-utils-3.3 -Standards-Version: 3.8.0 +Build-Depends: debhelper (>= 7), config-package-dev (>= 5.0~), xen-utils-4.1 +Standards-Version: 3.9.3 Package: invirt-xen-config Architecture: all -Depends: ${misc:Depends}, dsniff, lvm2, grub, ubuntu-xen-server, - invirt-base, python-sqlalchemy, python-psycopg2, - invirt-database +Depends: ${misc:Depends}, dsniff, lvm2, grub-pc, + xen-hypervisor-4.1, xen-utils-4.1, xen-tools, invirt-base, + bridge-utils, python-sqlalchemy, python-psycopg2, invirt-database, + ethtool Provides: ${diverted-files} Conflicts: ${diverted-files} Description: Xen configuration for Invirt host diff --git a/debian/invirt-xen-config.displace b/debian/invirt-xen-config.displace new file mode 100644 index 0000000..fa7ab7f --- /dev/null +++ b/debian/invirt-xen-config.displace @@ -0,0 +1,2 @@ +/etc/xen/qemu-ifup.invirt +/etc/xen/xend-config.sxp.invirt diff --git a/debian/invirt-xen-config.install b/debian/invirt-xen-config.install index c1d0e25..05ad6a7 100644 --- a/debian/invirt-xen-config.install +++ b/debian/invirt-xen-config.install @@ -2,5 +2,4 @@ qemu-dm-invirt usr/sbin qemu-ifup.invirt etc/xen invirt-database etc/xen vif-invirtroute etc/xen/scripts - -debian/xend-config.sxp.invirt.mako etc/xen +xend-config.sxp.invirt.mako etc/xen diff --git a/debian/invirt-xen-config.undisplace b/debian/invirt-xen-config.undisplace new file mode 100644 index 0000000..de75fc2 --- /dev/null +++ b/debian/invirt-xen-config.undisplace @@ -0,0 +1 @@ +/etc/apt/preferences.invirt diff --git a/debian/rules b/debian/rules index cb20bf8..cbe925d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,23 +1,3 @@ #!/usr/bin/make -f - -DEB_DIVERT_EXTENSION = .invirt - -DEB_DIVERT_FILES_invirt-xen-config += \ - /etc/xen/qemu-ifup.invirt \ - /etc/xen/xend-config.sxp.invirt - -DEB_UNDIVERT_FILES_invirt-xen-config += \ - /etc/apt/preferences.invirt - -DEB_UNDIVERT_VERSION_/etc/apt/preferences.invirt = 0.0.27~ - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/config-package.mk - -common-build-indep:: debian/xend-config.sxp.invirt.mako - -debian/xend-config.sxp.invirt.mako: $(call debian_check_files,/etc/xen/xend-config.sxp) - debian/transform_xend-config.sxp.invirt.mako < $< > $@ - -clean:: - rm -f debian/xend-config.sxp.invirt.mako +%: + dh $@ diff --git a/invirt-database b/invirt-database index e4eed03..599d0b7 100644 --- a/invirt-database +++ b/invirt-database @@ -14,18 +14,18 @@ def check(b): import sys sys.exit(1) -machine = models.Machine.query().filter_by(name=machine_name).one() +machine = models.Machine.query.filter_by(name=machine_name).one() check(machine is not None) machine_type = machine.type cdrom = None if 'cdrom_image' in locals(): - cdrom = models.CDROM.query().filter_by(cdrom_id=cdrom_image).one() + cdrom = models.CDROM.query.filter_by(cdrom_id=cdrom_image).one() check(cdrom is not None) memory = machine.memory maxmem = '2048' check(re.match('^[A-Za-z0-9][A-Za-z0-9._-]*$', machine.name)) -name = prefix + machine.name +name = prefix + machine_name check(re.match('^[0-9a-f-]+$', machine.uuid)) uuid = machine.uuid @@ -105,7 +105,7 @@ elif cdrom is not None: if codepath == 'hvm': ioemu = "ioemu:" viftype = "type=ioemu, " - kernel = '/usr/lib/xen/boot/hvmloader' + kernel = '/usr/lib/xen-4.1/boot/hvmloader' builder = 'hvm' vnc = 1 device_model = '/usr/sbin/qemu-dm-invirt' diff --git a/qemu-dm-invirt b/qemu-dm-invirt index 922a539..73a8cf2 100755 --- a/qemu-dm-invirt +++ b/qemu-dm-invirt @@ -9,4 +9,4 @@ for i; do fi done export domid -exec "/usr/lib/xen/bin/qemu-dm" "$@" +exec "/usr/lib/xen-4.1/bin/qemu-dm" "$@" diff --git a/debian/transform_xend-config.sxp.invirt.mako b/templatize-xend-config similarity index 74% rename from debian/transform_xend-config.sxp.invirt.mako rename to templatize-xend-config index 0ed5816..1dc1a3a 100755 --- a/debian/transform_xend-config.sxp.invirt.mako +++ b/templatize-xend-config @@ -18,6 +18,8 @@ if internal_ip is None: EOF s/^\#?\(xend-relocation-address ''\)/(xend-relocation-address '\${internal_ip}')/m or die; -s/^\(xend-relocation-hosts-allow '[^']*'\)/(xend-relocation-hosts-allow '')/m or die; +s/^\#?\(xend-relocation-hosts-allow '[^']*'\)/(xend-relocation-hosts-allow '')/m or die; +# s/^(\# )?\(network-script network-bridge\)/(network-script 'network-bridge')/m or die; s/^\(dom0-min-mem [0-9]*\)/(dom0-min-mem 1536)/m or die; +s/\$(\{XEN_CONFIG_DIR\})/$1/m or die; print;