Attachment 179219 Details for Bug 216376 – emulators/py-nova: fix xen console and floating ips

[patch] emulators/py-nova: fix xen console and floating ips

py-nova-14.0.3_1.diff (text/plain), 3.24 KB, created by Alexander Nusov on 2017-01-22 17:08:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Nusov

Created: 2017-01-22 17:08:44 UTC

Size: 3.24 KB

patch

obsolete

>Index: emulators/py-nova/Makefile
>===================================================================
>--- emulators/py-nova/Makefile	(revision 432113)
>+++ emulators/py-nova/Makefile	(working copy)
>@@ -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 @@
> 		${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
> 
>Index: emulators/py-nova/files/08-fix-floating-ips.patch
>===================================================================
>--- emulators/py-nova/files/08-fix-floating-ips.patch	(nonexistent)
>+++ emulators/py-nova/files/08-fix-floating-ips.patch	(working copy)
>@@ -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):
>
>Property changes on: emulators/py-nova/files/08-fix-floating-ips.patch
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: emulators/py-nova/files/09-fix-xen-console.patch
>===================================================================
>--- emulators/py-nova/files/09-fix-xen-console.patch	(nonexistent)
>+++ emulators/py-nova/files/09-fix-xen-console.patch	(working copy)
>@@ -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)
>
>Property changes on: emulators/py-nova/files/09-fix-xen-console.patch
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 216376: 179219