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>

2 files changed, 26 insertions, 0 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-keystone/Update-test-core-ETCDIR-location.patch b/meta-openstack/recipes-devtools/python/python-keystone/Update-test-core-ETCDIR-location.patch
new file mode 100644
index 0000000..458b618
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-keystone/Update-test-core-ETCDIR-location.patch
@@ -0,0 +1,24 @@
+Update test core 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>
+diff --git a/keystone/tests/core.py b/keystone/tests/core.py
+index 860f68d..565cbcc 100644
+--- a/keystone/tests/core.py
++++ b/keystone/tests/core.py
+@@ -77,7 +77,7 @@ LOG = logging.getLogger(__name__)
+ TESTSDIR = os.path.dirname(os.path.abspath(__file__))
+ ROOTDIR = os.path.normpath(os.path.join(TESTSDIR, '..', '..'))
+ VENDOR = os.path.join(ROOTDIR, 'vendor')
+-ETCDIR = os.path.join(ROOTDIR, 'etc')
++ETCDIR = "/etc/keystone"
+ TMPDIR = os.path.join(TESTSDIR, 'tmp')
+ 
+ CONF = config.CONF
+-- 
+1.7.9.5
+
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 \
            file://identity.sh \
            file://keystone \
            file://openrc \
+           file://Update-test-core-ETCDIR-location.patch \
           "
 
 SRCREV="0d83e7eee20a50a75863a9d3c75aee7030518229"
@@ -43,6 +44,7 @@ do_install_append() {
     install -m 600 ${WORKDIR}/openrc ${KEYSTONE_CONF_DIR}/
     install -m 600 ${S}/etc/logging.conf.sample ${KEYSTONE_CONF_DIR}/logging.conf
     install -m 600 ${S}/etc/policy.json ${KEYSTONE_CONF_DIR}/policy.json
+    install -m 600 ${S}/etc/keystone.conf.sample ${KEYSTONE_CONF_DIR}/keystone.conf.sample
 
     if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
         install -d ${D}${sysconfdir}/init.d