summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-plugin-directory.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-plugin-directory.patch')
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-plugin-directory.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-plugin-directory.patch b/meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-plugin-directory.patch
deleted file mode 100644
index 25c362c..0000000
--- a/meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-plugin-directory.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From aa0f004fa421cdd9e0674934d3e66d1dcd8bde07 Mon Sep 17 00:00:00 2001
2From: Keith Holman <Keith.Holman@windriver.com>
3Date: Tue, 17 Jun 2014 16:51:22 -0400
4Subject: [PATCH] nova: fix location to plugin directory
5
6Currently, the tests included with nova expect the plugin directory to
7be in the location they exist in the source tree. However, during
8system deployment the plugins are installed under the "nova" directory
9one level higher in the directory tree. This patch fixes the relative
10path to be able to find the files.
11
12Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
13---
14 nova/tests/virt/xenapi/test_xenapi.py | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/nova/tests/virt/xenapi/test_xenapi.py b/nova/tests/virt/xenapi/test_xenapi.py
18index 9a45bf0..88f8a76 100644
19--- a/nova/tests/virt/xenapi/test_xenapi.py
20+++ b/nova/tests/virt/xenapi/test_xenapi.py
21@@ -4013,7 +4013,7 @@ class XenAPISessionTestCase(test.NoDBTestCase):
22
23 # Import the plugin to extract its version
24 path = os.path.dirname(__file__)
25- rel_path_elem = "../../../../plugins/xenserver/xenapi/etc/xapi.d/" \
26+ rel_path_elem = "../../../plugins/xenserver/xenapi/etc/xapi.d/" \
27 "plugins/nova_plugin_version"
28 for elem in rel_path_elem.split('/'):
29 path = os.path.join(path, elem)
30--
311.9.3
32