summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-cinder_git.bb
diff options
context:
space:
mode:
authorVu Tran <vu.tran@windriver.com>2014-06-18 15:45:37 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-06-23 15:55:45 -0400
commitcb6a12ad7c10b7cf2922facd3464200272a34996 (patch)
treeb43966bffc53341c9f64243760529d63f0f54c9d /meta-openstack/recipes-devtools/python/python-cinder_git.bb
parenteb66359572b003e3babf58fca317363cd06a16c0 (diff)
downloadmeta-cloud-services-cb6a12ad7c10b7cf2922facd3464200272a34996.tar.gz
cinder builtin tests config location
Many cinder built-in testcases failed because they can not find cinder configuration file, as these testcases assume that they are run at python site-packages dir. So forcing these failure testcases to look for these configuration file using absolute path. Signed-off-by: Vu Tran <vu.tran@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-cinder_git.bb')
-rw-r--r--meta-openstack/recipes-devtools/python/python-cinder_git.bb6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
index b723257..7b3bb28 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
@@ -17,6 +17,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
17 file://lvm_iscsi_setup.sh \ 17 file://lvm_iscsi_setup.sh \
18 file://add-cinder-volume-types.sh \ 18 file://add-cinder-volume-types.sh \
19 file://fix_cinder_memory_leak.patch \ 19 file://fix_cinder_memory_leak.patch \
20 file://cinder-builtin-tests-config-location.patch \
20 " 21 "
21 22
22SRCREV="81259f36f57e91b31009fbd209ea2a07a2ceb213" 23SRCREV="81259f36f57e91b31009fbd209ea2a07a2ceb213"
@@ -27,6 +28,11 @@ inherit setuptools update-rc.d identity default_configs
27 28
28CINDER_BACKUP_BACKEND_DRIVER ?= "cinder.backup.drivers.swift" 29CINDER_BACKUP_BACKEND_DRIVER ?= "cinder.backup.drivers.swift"
29 30
31do_install_prepend() {
32 sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/conf_fixture.py
33 sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/fake_flags.py
34}
35
30do_install_append() { 36do_install_append() {
31 TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} 37 TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME}
32 CINDER_CONF_DIR=${D}${sysconfdir}/${SRCNAME} 38 CINDER_CONF_DIR=${D}${sysconfdir}/${SRCNAME}