diff options
author | Keith Holman <Keith.Holman@windriver.com> | 2014-06-13 15:09:46 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-06-16 15:23:23 -0400 |
commit | 7d2af28606c5dde7fa05bcdeb7d31188bae25b70 (patch) | |
tree | 900f5df1b4eeb7d91785c566d92bedf3f8fa66df /meta-openstack/recipes-devtools/python/python-barbican_git.bb | |
parent | 7af8f00fc7ff4f3301744c568c9b503b05aafbeb (diff) | |
download | meta-cloud-services-7d2af28606c5dde7fa05bcdeb7d31188bae25b70.tar.gz |
barbican: add full path to test configuration files
Barbican expects configuration files for its tests to be in the same
location as they appear in the source tree. However, during
deployment configuration files are put into the /etc/barbican
directory. This fix patches the tests to find the configuration files
in the directory they are placed by the barbican recipe.
Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-barbican_git.bb')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-barbican_git.bb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-barbican_git.bb b/meta-openstack/recipes-devtools/python/python-barbican_git.bb index 0b6a6a7..8e53efd 100644 --- a/meta-openstack/recipes-devtools/python/python-barbican_git.bb +++ b/meta-openstack/recipes-devtools/python/python-barbican_git.bb | |||
@@ -11,6 +11,7 @@ BARBICAN_MAX_PACKET_SIZE ?= "65535" | |||
11 | SRC_URI = "git://github.com/openstack/barbican.git;branch=master \ | 11 | SRC_URI = "git://github.com/openstack/barbican.git;branch=master \ |
12 | file://barbican.init \ | 12 | file://barbican.init \ |
13 | file://barbican-increase-buffer-size-to-support-PKI-tokens.patch \ | 13 | file://barbican-increase-buffer-size-to-support-PKI-tokens.patch \ |
14 | file://barbican-fix-path-to-find-configuration-files.patch \ | ||
14 | " | 15 | " |
15 | 16 | ||
16 | SRCREV="177d4499af6b261f48814503e3565f433e86cc66" | 17 | SRCREV="177d4499af6b261f48814503e3565f433e86cc66" |
@@ -42,6 +43,9 @@ do_install_append() { | |||
42 | rm -f ${D}/usr/bin/barbican.sh | 43 | rm -f ${D}/usr/bin/barbican.sh |
43 | rm -f ${D}/usr/bin/barbican-worker.py | 44 | rm -f ${D}/usr/bin/barbican-worker.py |
44 | fi | 45 | fi |
46 | |||
47 | sed -e "s:%BARBICAN_CONF_DIR%:${sysconfdir}/${SRCNAME}:g" \ | ||
48 | -i ${D}/${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/tests/api/test_resources_policy.py | ||
45 | } | 49 | } |
46 | 50 | ||
47 | USERADD_PACKAGES = "${PN}" | 51 | USERADD_PACKAGES = "${PN}" |