summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-nova/Make-rbd.libvirt_info-parent-class-compatible.patch
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2018-04-04 16:02:56 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2018-04-09 10:48:37 -0400
commite7b4a0b965bb40861a487c13199755044919472a (patch)
tree740373e9594abbadd846279582c596cc9e2607dd /meta-openstack/recipes-devtools/python/python-nova/Make-rbd.libvirt_info-parent-class-compatible.patch
parentc87a3d517bd49b1e915ba9bb3f20bfc86d239dbc (diff)
downloadmeta-cloud-services-e7b4a0b965bb40861a487c13199755044919472a.tar.gz
python-nova: uprev to latest openstack sable/pike release
This requires several new recipes and package uprevs (python-tooz, python-os-brick, python-pypowervm, python-networkx, python-microversion-parse, python-os-win, python-os-vif, and python-os-traits). Along with updates to make things work with systemd. We also take steps to make setup/init use the directions from https://docs.openstack.org/nova/pike/install/controller-install-ubuntu.html After these changes we can validate that nova is operating nominally using the command: +-------+--------------------------------------+ | Name | UUID | +-------+--------------------------------------+ | cell0 | 00000000-0000-0000-0000-000000000000 | | cell1 | f547fa04-7c82-4498-95ee-210fc40abdb6 | +-------+--------------------------------------+ Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova/Make-rbd.libvirt_info-parent-class-compatible.patch')
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova/Make-rbd.libvirt_info-parent-class-compatible.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova/Make-rbd.libvirt_info-parent-class-compatible.patch b/meta-openstack/recipes-devtools/python/python-nova/Make-rbd.libvirt_info-parent-class-compatible.patch
deleted file mode 100644
index 542abf5..0000000
--- a/meta-openstack/recipes-devtools/python/python-nova/Make-rbd.libvirt_info-parent-class-compatible.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1Make rbd.libvirt_info parent class compatible
2
3commit 7a34be0ec0cd0cb9555fe64ff6c486faae1ae91d from
4https://github.com/openstack/nova
5
6Rbd.libvirt_info function definition misses hypervisor_version argument added in change:
7https://review.openstack.org/32379
8
9Closes-Bug: #1233188
10Change-Id: Ib68d743e783af0f6d82d2ba180869ee642e86050
11
12diff --git a/nova/tests/virt/libvirt/test_imagebackend.py b/nova/tests/virt/libvirt/test_imagebackend.py
13index 2455ec8..5bfa94d 100644
14--- a/nova/tests/virt/libvirt/test_imagebackend.py
15+++ b/nova/tests/virt/libvirt/test_imagebackend.py
16@@ -20,6 +20,8 @@ import os
17 import fixtures
18 from oslo.config import cfg
19
20+from inspect import getargspec
21+
22 from nova import exception
23 from nova.openstack.common import uuidutils
24 from nova import test
25@@ -630,6 +632,10 @@ class RbdTestCase(_ImageTestCase, test.NoDBTestCase):
26
27 self.assertEqual(fake_processutils.fake_execute_get_log(), [])
28
29+ def test_parent_compatible(self):
30+ self.assertEqual(getargspec(imagebackend.Image.libvirt_info),
31+ getargspec(self.image_class.libvirt_info))
32+
33
34 class BackendTestCase(test.NoDBTestCase):
35 INSTANCE = {'name': 'fake-instance',
36diff --git a/nova/virt/libvirt/imagebackend.py b/nova/virt/libvirt/imagebackend.py
37index e900789..51872cf 100644
38--- a/nova/virt/libvirt/imagebackend.py
39+++ b/nova/virt/libvirt/imagebackend.py
40@@ -482,7 +482,7 @@ class Rbd(Image):
41 return hosts, ports
42
43 def libvirt_info(self, disk_bus, disk_dev, device_type, cache_mode,
44- extra_specs):
45+ extra_specs, hypervisor_version):
46 """Get `LibvirtConfigGuestDisk` filled for this image.
47
48 :disk_dev: Disk bus device name