diff options
| author | Keith Holman <Keith.Holman@windriver.com> | 2014-06-03 17:04:22 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-06-09 10:49:39 -0400 |
| commit | 28f26ad0727a870e9dfc8b1442bb8ceaeaebb5e8 (patch) | |
| tree | 9bfb83ad840710ffb972fe965469e11ebad49a7d /meta-openstack/recipes-devtools/python/python-keystone_git.bb | |
| parent | 30fb955532564e0f75ecc9d69e9c19566fbbe710 (diff) | |
| download | meta-cloud-services-28f26ad0727a870e9dfc8b1442bb8ceaeaebb5e8.tar.gz | |
keystone: fix location of files for tests
Keystone tests define the location of certificate files
as the location of the files in the source tree. However,
when installed on the system files are put in different
locations. This change patches the configuration file
for some tests to contain the full path to the tests
directories.
Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-keystone_git.bb')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-keystone_git.bb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb index dbf2bce..08a9132 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb | |||
| @@ -13,6 +13,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ | |||
| 13 | file://keystone \ | 13 | file://keystone \ |
| 14 | file://openrc \ | 14 | file://openrc \ |
| 15 | file://keystone-search-in-etc-directory-for-config-files.patch \ | 15 | file://keystone-search-in-etc-directory-for-config-files.patch \ |
| 16 | file://keystone-fix-location-of-files-for-tests.patch \ | ||
| 16 | " | 17 | " |
| 17 | 18 | ||
| 18 | SRCREV="e7c29874e5a0e43f4f0e9970556c701af508152f" | 19 | SRCREV="e7c29874e5a0e43f4f0e9970556c701af508152f" |
| @@ -58,6 +59,8 @@ do_install_append() { | |||
| 58 | install -m 0755 ${WORKDIR}/keystone ${D}${sysconfdir}/init.d/keystone | 59 | install -m 0755 ${WORKDIR}/keystone ${D}${sysconfdir}/init.d/keystone |
| 59 | fi | 60 | fi |
| 60 | 61 | ||
| 62 | sed -e "s:%KEYSTONE_PACKAGE_DIR%:${PYTHON_SITEPACKAGES_DIR}/keystone:g" -i ${KEYSTONE_PACKAGE_DIR}/tests/test_overrides.conf | ||
| 63 | |||
| 61 | cp run_tests.sh ${KEYSTONE_CONF_DIR} | 64 | cp run_tests.sh ${KEYSTONE_CONF_DIR} |
| 62 | } | 65 | } |
| 63 | 66 | ||
