diff options
author | Vu Tran <vu.tran@windriver.com> | 2014-06-18 15:45:37 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-06-23 15:54:54 -0400 |
commit | 514464e1aa202cd6870d769289b709c079e33ce7 (patch) | |
tree | e6d59b9074333908582078eadb1f5ede4255bc13 /meta-openstack/recipes-devtools/python/python-cinder_git.bb | |
parent | 1f578a07a36ec3c0bd40548873d9c7c79822ddac (diff) | |
download | meta-cloud-services-514464e1aa202cd6870d769289b709c079e33ce7.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.bb | 5 |
1 files changed, 5 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 58088c9..0866dca 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/icehouse \ | |||
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 | ||
22 | SRCREV="978b036a6467f7f6afb4419f92bf4fa7d1ff2347" | 23 | SRCREV="978b036a6467f7f6afb4419f92bf4fa7d1ff2347" |
@@ -27,6 +28,10 @@ inherit setuptools update-rc.d identity default_configs | |||
27 | 28 | ||
28 | CINDER_BACKUP_BACKEND_DRIVER ?= "cinder.backup.drivers.swift" | 29 | CINDER_BACKUP_BACKEND_DRIVER ?= "cinder.backup.drivers.swift" |
29 | 30 | ||
31 | do_install_prepend() { | ||
32 | sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/conf_fixture.py | ||
33 | } | ||
34 | |||
30 | do_install_append() { | 35 | do_install_append() { |
31 | TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} | 36 | TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} |
32 | CINDER_CONF_DIR=${D}${sysconfdir}/${SRCNAME} | 37 | CINDER_CONF_DIR=${D}${sysconfdir}/${SRCNAME} |