2 files changed, 49 insertions, 0 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-doc-directory.patch b/meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-doc-directory.patch
new file mode 100644
index 0000000..7893f87
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-doc-directory.patch
@@ -0,0 +1,46 @@
+From 4d74c926b8dd7eaac0c9ddac0d1161f634b69e1d Mon Sep 17 00:00:00 2001
+From: Keith Holman <Keith.Holman@windriver.com>
+Date: Tue, 17 Jun 2014 16:40:51 -0400
+Subject: [PATCH] nova: fix location to doc directory
+
+Currently, the tests included with nova expect the doc directory to be
+in the location they exist in the source tree.  However, during system
+deployment the documentation is installed under the "nova" directory 1
+level higher in the directory tree.  This patch fixes the relative
+path to be able to find the files.
+
+Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
+---
+ nova/tests/integrated/api_samples_test_base.py | 2 +-
+ nova/tests/integrated/v3/api_sample_base.py    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/nova/tests/integrated/api_samples_test_base.py b/nova/tests/integrated/api_samples_test_base.py
+index 6acb5a1..31caa6c 100644
+--- a/nova/tests/integrated/api_samples_test_base.py
++++ b/nova/tests/integrated/api_samples_test_base.py
+@@ -88,7 +88,7 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase):
+     @classmethod
+     def _get_sample(cls, name):
+         dirname = os.path.dirname(os.path.abspath(__file__))
+-        dirname = os.path.normpath(os.path.join(dirname, "../../../doc"))
++        dirname = os.path.normpath(os.path.join(dirname, "../../doc"))
+         return cls._get_sample_path(name, dirname)
+ 
+     @classmethod
+diff --git a/nova/tests/integrated/v3/api_sample_base.py b/nova/tests/integrated/v3/api_sample_base.py
+index aa1ca8f..d22a2c8 100644
+--- a/nova/tests/integrated/v3/api_sample_base.py
++++ b/nova/tests/integrated/v3/api_sample_base.py
+@@ -71,7 +71,7 @@ class ApiSampleTestBaseV3(api_samples_test_base.ApiSampleTestBase):
+     @classmethod
+     def _get_sample(cls, name):
+         dirname = os.path.dirname(os.path.abspath(__file__))
+-        dirname = os.path.normpath(os.path.join(dirname, "../../../../doc/v3"))
++        dirname = os.path.normpath(os.path.join(dirname, "../../../doc/v3"))
+         return cls._get_sample_path(name, dirname)
+ 
+     @classmethod
+-- 
+1.9.3
+
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index a6d5fc8..46aa561 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -14,6 +14,7 @@ FILESEXTRAPATHS := "${THISDIR}/${PN}"
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/icehouse \
            file://nova-add-migrate.cfg-to-the-MANIFEST.patch \
            file://nova-convert-path-from-relative-to-absolute.patch \
+           file://nova-fix-location-to-doc-directory.patch \
            "
 
 SRC_URI += "file://nova-all \
@@ -121,6 +122,8 @@ do_install_append() {
 
     install -d ${D}/${sysconfdir}/bash_completion.d
     install -m 664 ${S}/tools/nova-manage.bash_completion ${D}/${sysconfdir}/bash_completion.d
+
+    cp -r "${S}/doc" "${D}/${PYTHON_SITEPACKAGES_DIR}/nova"
 }
 
 pkg_postinst_${SRCNAME}-setup () {