diff options
Diffstat (limited to 'meta-openstack')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-plugin-directory.patch | 32 | ||||
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova_git.bb | 2 |
2 files changed, 34 insertions, 0 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 new file mode 100644 index 0000000..25c362c --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-plugin-directory.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From aa0f004fa421cdd9e0674934d3e66d1dcd8bde07 Mon Sep 17 00:00:00 2001 | ||
2 | From: Keith Holman <Keith.Holman@windriver.com> | ||
3 | Date: Tue, 17 Jun 2014 16:51:22 -0400 | ||
4 | Subject: [PATCH] nova: fix location to plugin directory | ||
5 | |||
6 | Currently, the tests included with nova expect the plugin directory to | ||
7 | be in the location they exist in the source tree. However, during | ||
8 | system deployment the plugins are installed under the "nova" directory | ||
9 | one level higher in the directory tree. This patch fixes the relative | ||
10 | path to be able to find the files. | ||
11 | |||
12 | Signed-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 | |||
17 | diff --git a/nova/tests/virt/xenapi/test_xenapi.py b/nova/tests/virt/xenapi/test_xenapi.py | ||
18 | index 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 | -- | ||
31 | 1.9.3 | ||
32 | |||
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb index 46aa561..a4af280 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_git.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb | |||
@@ -15,6 +15,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/icehouse \ | |||
15 | file://nova-add-migrate.cfg-to-the-MANIFEST.patch \ | 15 | file://nova-add-migrate.cfg-to-the-MANIFEST.patch \ |
16 | file://nova-convert-path-from-relative-to-absolute.patch \ | 16 | file://nova-convert-path-from-relative-to-absolute.patch \ |
17 | file://nova-fix-location-to-doc-directory.patch \ | 17 | file://nova-fix-location-to-doc-directory.patch \ |
18 | file://nova-fix-location-to-plugin-directory.patch \ | ||
18 | " | 19 | " |
19 | 20 | ||
20 | SRC_URI += "file://nova-all \ | 21 | SRC_URI += "file://nova-all \ |
@@ -124,6 +125,7 @@ do_install_append() { | |||
124 | install -m 664 ${S}/tools/nova-manage.bash_completion ${D}/${sysconfdir}/bash_completion.d | 125 | install -m 664 ${S}/tools/nova-manage.bash_completion ${D}/${sysconfdir}/bash_completion.d |
125 | 126 | ||
126 | cp -r "${S}/doc" "${D}/${PYTHON_SITEPACKAGES_DIR}/nova" | 127 | cp -r "${S}/doc" "${D}/${PYTHON_SITEPACKAGES_DIR}/nova" |
128 | cp -r "${S}/plugins" "${D}/${PYTHON_SITEPACKAGES_DIR}/nova" | ||
127 | } | 129 | } |
128 | 130 | ||
129 | pkg_postinst_${SRCNAME}-setup () { | 131 | pkg_postinst_${SRCNAME}-setup () { |