Date: Thu, 26 Jan 2017 14:23:02 +0000 (UTC) From: Roman Bogorodskiy <novel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432491 - in head/emulators/py-nova: . files Message-ID: <201701261423.v0QEN2ZW035708@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: novel Date: Thu Jan 26 14:23:02 2017 New Revision: 432491 URL: https://svnweb.freebsd.org/changeset/ports/432491 Log: emulators/py-nova: fix floating ips and serial console - fix floating IP API (missing join of fixed_ip column) - fix serial console on Xen (empty log in nova/horizon) PR: 216376 Submitted by: maintainer Added: head/emulators/py-nova/files/08-fix-floating-ips.patch (contents, props changed) head/emulators/py-nova/files/09-fix-xen-console.patch (contents, props changed) Modified: head/emulators/py-nova/Makefile Modified: head/emulators/py-nova/Makefile ============================================================================== --- head/emulators/py-nova/Makefile Thu Jan 26 14:13:21 2017 (r432490) +++ head/emulators/py-nova/Makefile Thu Jan 26 14:23:02 2017 (r432491) @@ -3,6 +3,7 @@ PORTNAME= nova PORTVERSION= 14.0.3 +PORTREVISION= 1 CATEGORIES= emulators python MASTER_SITES= https://fossies.org/linux/misc/openstack/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -80,7 +81,9 @@ EXTRA_PATCHES= ${FILESDIR}/01-firewall-m ${FILESDIR}/04-xen-phy.patch:-p1 \ ${FILESDIR}/05-online-cpus.patch:-p1 \ ${FILESDIR}/06-freebsd-net.patch:-p1 \ - ${FILESDIR}/07-fix-xen-xvd.patch:-p1 + ${FILESDIR}/07-fix-xen-xvd.patch:-p1 \ + ${FILESDIR}/08-fix-floating-ips.patch:-p1 \ + ${FILESDIR}/09-fix-xen-console.patch:-p1 ONLY_FOR_ARCHS= amd64 Added: head/emulators/py-nova/files/08-fix-floating-ips.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/py-nova/files/08-fix-floating-ips.patch Thu Jan 26 14:23:02 2017 (r432491) @@ -0,0 +1,14 @@ +diff --git a/nova/objects/floating_ip.py b/nova/objects/floating_ip.py +index 9881dfcecf..922a86a31e 100644 +--- a/nova/objects/floating_ip.py ++++ b/nova/objects/floating_ip.py +@@ -194,7 +194,8 @@ class FloatingIPList(obj_base.ObjectListBase, obj_base.NovaObject): + def get_by_project(cls, context, project_id): + db_floatingips = db.floating_ip_get_all_by_project(context, project_id) + return obj_base.obj_make_list(context, cls(context), +- objects.FloatingIP, db_floatingips) ++ objects.FloatingIP, db_floatingips, ++ expected_attrs=['fixed_ip']) + + @obj_base.remotable_classmethod + def get_by_fixed_address(cls, context, fixed_address): Added: head/emulators/py-nova/files/09-fix-xen-console.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/py-nova/files/09-fix-xen-console.patch Thu Jan 26 14:23:02 2017 (r432491) @@ -0,0 +1,13 @@ +diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py +index 6d0e41ad2c..ebd1a6fdad 100644 +--- a/nova/virt/libvirt/driver.py ++++ b/nova/virt/libvirt/driver.py +@@ -4321,7 +4321,7 @@ class LibvirtDriver(driver.ComputeDriver): + + def _create_consoles(self, virt_type, guest, instance, flavor, image_meta, + caps): +- if virt_type in ("qemu", "kvm"): ++ if virt_type in ("qemu", "kvm", "xen"): + # Create the serial console char devices + self._create_serial_console_devices(guest, instance, flavor, + image_meta)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701261423.v0QEN2ZW035708>