diff options
| author | Vu Tran <vu.tran@windriver.com> | 2014-02-05 14:45:27 -0500 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-02-10 11:50:14 -0500 |
| commit | 3f98e8ae0ab19174b9cabe56ef13a4a6f923fe63 (patch) | |
| tree | 799e85a2398257acb87501142a840c8d36168c77 /meta-openstack/recipes-devtools/python/python-keystone_git.bb | |
| parent | bf3023d307cc476c5d9ce6e650bfb14f0a31f8ee (diff) | |
| download | meta-cloud-services-3f98e8ae0ab19174b9cabe56ef13a4a6f923fe63.tar.gz | |
keystone: fix tests ETCDIR location
Tests in keystone/tests are failed because they
looks for some config files at wrong location.
Currently all the keystone config files are at
/etc/keystone.
Signed-off-by: Vu Tran <vu.tran@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@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 | 2 |
1 files changed, 2 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 6825461..aa42824 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb | |||
| @@ -12,6 +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 | " | 16 | " |
| 16 | 17 | ||
| 17 | SRCREV="0d83e7eee20a50a75863a9d3c75aee7030518229" | 18 | SRCREV="0d83e7eee20a50a75863a9d3c75aee7030518229" |
| @@ -43,6 +44,7 @@ do_install_append() { | |||
| 43 | install -m 600 ${WORKDIR}/openrc ${KEYSTONE_CONF_DIR}/ | 44 | install -m 600 ${WORKDIR}/openrc ${KEYSTONE_CONF_DIR}/ |
| 44 | install -m 600 ${S}/etc/logging.conf.sample ${KEYSTONE_CONF_DIR}/logging.conf | 45 | install -m 600 ${S}/etc/logging.conf.sample ${KEYSTONE_CONF_DIR}/logging.conf |
| 45 | install -m 600 ${S}/etc/policy.json ${KEYSTONE_CONF_DIR}/policy.json | 46 | install -m 600 ${S}/etc/policy.json ${KEYSTONE_CONF_DIR}/policy.json |
| 47 | install -m 600 ${S}/etc/keystone.conf.sample ${KEYSTONE_CONF_DIR}/keystone.conf.sample | ||
| 46 | 48 | ||
| 47 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 49 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
| 48 | install -d ${D}${sysconfdir}/init.d | 50 | install -d ${D}${sysconfdir}/init.d |
