diff options
| author | Roman Bogorodskiy <novel@FreeBSD.org> | 2017-01-26 14:23:02 +0000 |
|---|---|---|
| committer | Roman Bogorodskiy <novel@FreeBSD.org> | 2017-01-26 14:23:02 +0000 |
| commit | 7fce98c2c1e79ac0f204c48faa49e7389bec0a7d (patch) | |
| tree | f6137a0451724ae9c1a5f0f1f1083ed27cdd4ed1 | |
| parent | ae81e282e1c24ae4e6b2646d85dc70b6145c9eaa (diff) | |
Notes
| -rw-r--r-- | emulators/py-nova/Makefile | 5 | ||||
| -rw-r--r-- | emulators/py-nova/files/08-fix-floating-ips.patch | 14 | ||||
| -rw-r--r-- | emulators/py-nova/files/09-fix-xen-console.patch | 13 |
3 files changed, 31 insertions, 1 deletions
diff --git a/emulators/py-nova/Makefile b/emulators/py-nova/Makefile index a8d4c7d8de2b..332b051d6c24 100644 --- a/emulators/py-nova/Makefile +++ b/emulators/py-nova/Makefile @@ -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-manager.patch:-p1 \ ${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 diff --git a/emulators/py-nova/files/08-fix-floating-ips.patch b/emulators/py-nova/files/08-fix-floating-ips.patch new file mode 100644 index 000000000000..72c7ace0b6b0 --- /dev/null +++ b/emulators/py-nova/files/08-fix-floating-ips.patch @@ -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): diff --git a/emulators/py-nova/files/09-fix-xen-console.patch b/emulators/py-nova/files/09-fix-xen-console.patch new file mode 100644 index 000000000000..84df155441c9 --- /dev/null +++ b/emulators/py-nova/files/09-fix-xen-console.patch @@ -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) |