diff options
| author | novel <novel@FreeBSD.org> | 2017-01-26 22:23:02 +0800 |
|---|---|---|
| committer | novel <novel@FreeBSD.org> | 2017-01-26 22:23:02 +0800 |
| commit | d93e957f1bd309ce963193d2a5d072fa7f47627e (patch) | |
| tree | f6137a0451724ae9c1a5f0f1f1083ed27cdd4ed1 /emulators/py-nova/files | |
| parent | 76087a290550f477890f2259514bc5ce1e02394d (diff) | |
| download | freebsd-ports-gnome-d93e957f1bd309ce963193d2a5d072fa7f47627e.tar.gz freebsd-ports-gnome-d93e957f1bd309ce963193d2a5d072fa7f47627e.tar.zst freebsd-ports-gnome-d93e957f1bd309ce963193d2a5d072fa7f47627e.zip | |
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
Diffstat (limited to 'emulators/py-nova/files')
| -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 |
2 files changed, 27 insertions, 0 deletions
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) |