diff options
author | Keith Holman <Keith.Holman@windriver.com> | 2014-06-05 14:49:01 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-06-09 09:45:08 -0400 |
commit | a5b0fecee722961f2853282dfd547c685cc1b697 (patch) | |
tree | 54afe3530b144a64520ad7fa7b86aeacd9bcea49 /meta-openstack/recipes-devtools/python/python-keystone_git.bb | |
parent | cb51b975094c964def9abcd466cdec64ec338c3c (diff) | |
download | meta-cloud-services-a5b0fecee722961f2853282dfd547c685cc1b697.tar.gz |
keystone: fix paths for testing
Keystone tests are designed to run on the source tree.
However, Keystone is installed on a system with files
in various directories. This fix patches the testing
source files to be able to find the files on the
distribution. This fix incorporates the changes of
a previous patch file into a new patch file that is
generated, since the previous patch are related and
close to eachother in the source and it is easier to
maintain less patch files.
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, 2 insertions, 1 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb index b4b069e..be74fd4 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb | |||
@@ -12,7 +12,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ | |||
12 | file://identity.sh \ | 12 | file://identity.sh \ |
13 | file://keystone \ | 13 | file://keystone \ |
14 | file://openrc \ | 14 | file://openrc \ |
15 | file://Update-test-core-ETCDIR-location.patch \ | 15 | file://keystone-search-in-etc-directory-for-config-files.patch \ |
16 | " | 16 | " |
17 | 17 | ||
18 | SRCREV="a96d1a44bc0f074729c312e5c2a0f0875edf1765" | 18 | SRCREV="a96d1a44bc0f074729c312e5c2a0f0875edf1765" |
@@ -39,6 +39,7 @@ do_install_append() { | |||
39 | install -m 600 ${S}/etc/logging.conf.sample ${KEYSTONE_CONF_DIR}/logging.conf | 39 | install -m 600 ${S}/etc/logging.conf.sample ${KEYSTONE_CONF_DIR}/logging.conf |
40 | install -m 600 ${S}/etc/policy.json ${KEYSTONE_CONF_DIR}/policy.json | 40 | install -m 600 ${S}/etc/policy.json ${KEYSTONE_CONF_DIR}/policy.json |
41 | install -m 600 ${S}/etc/keystone.conf.sample ${KEYSTONE_CONF_DIR}/keystone.conf.sample | 41 | install -m 600 ${S}/etc/keystone.conf.sample ${KEYSTONE_CONF_DIR}/keystone.conf.sample |
42 | install -m 600 ${S}/etc/keystone-paste.ini ${KEYSTONE_CONF_DIR}/keystone-paste.ini | ||
42 | 43 | ||
43 | sed -e "s:%SERVICE_TOKEN%:${SERVICE_TOKEN}:g" -i ${KEYSTONE_CONF_DIR}/keystone.conf | 44 | sed -e "s:%SERVICE_TOKEN%:${SERVICE_TOKEN}:g" -i ${KEYSTONE_CONF_DIR}/keystone.conf |
44 | sed -e "s:%DB_USER%:${DB_USER}:g" -i ${KEYSTONE_CONF_DIR}/keystone.conf | 45 | sed -e "s:%DB_USER%:${DB_USER}:g" -i ${KEYSTONE_CONF_DIR}/keystone.conf |