From 74f6718fc594b088fd9966562dbf8a110d2505d5 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 18 Jul 2014 13:05:34 -0400 Subject: keystone: uprev to juno Updating keystone to the juno release candidate. Also adding new dependencies. Note: also ensure that the new keystoneclient and keystonemiddleware are used. Signed-off-by: Bruce Ashfield --- .../keystone-remove-git-commands-in-tests.patch | 17 +++++++--------- ...-search-in-etc-directory-for-config-files.patch | 23 ++++++++++------------ .../recipes-devtools/python/python-keystone_git.bb | 13 +++++++----- 3 files changed, 25 insertions(+), 28 deletions(-) (limited to 'meta-openstack/recipes-devtools/python') diff --git a/meta-openstack/recipes-devtools/python/python-keystone/keystone-remove-git-commands-in-tests.patch b/meta-openstack/recipes-devtools/python/python-keystone/keystone-remove-git-commands-in-tests.patch index 5605950..928c0fb 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone/keystone-remove-git-commands-in-tests.patch +++ b/meta-openstack/recipes-devtools/python/python-keystone/keystone-remove-git-commands-in-tests.patch @@ -17,11 +17,11 @@ Signed-off-by: Keith Holman keystone/tests/core.py | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/keystone/tests/core.py b/keystone/tests/core.py -index 860f68d..9aa54db 100644 ---- a/keystone/tests/core.py -+++ b/keystone/tests/core.py -@@ -109,6 +109,7 @@ def checkout_vendor(repo, rev): +Index: git/keystone/tests/core.py +=================================================================== +--- git.orig/keystone/tests/core.py ++++ git/keystone/tests/core.py +@@ -125,6 +125,7 @@ working_dir = os.getcwd() revdir = os.path.join(VENDOR, '%s-%s' % (name, rev.replace('/', '_'))) @@ -29,14 +29,11 @@ index 860f68d..9aa54db 100644 modcheck = os.path.join(VENDOR, '.%s-%s' % (name, rev.replace('/', '_'))) try: if os.path.exists(modcheck): -@@ -129,6 +130,7 @@ def checkout_vendor(repo, rev): +@@ -145,6 +146,7 @@ fd.write('1') except environment.subprocess.CalledProcessError: LOG.warning(_('Failed to checkout %s'), repo) + """ - cd(working_dir) + os.chdir(working_dir) return revdir --- -1.9.3 - diff --git a/meta-openstack/recipes-devtools/python/python-keystone/keystone-search-in-etc-directory-for-config-files.patch b/meta-openstack/recipes-devtools/python/python-keystone/keystone-search-in-etc-directory-for-config-files.patch index 1259a20..6f88e17 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone/keystone-search-in-etc-directory-for-config-files.patch +++ b/meta-openstack/recipes-devtools/python/python-keystone/keystone-search-in-etc-directory-for-config-files.patch @@ -14,23 +14,23 @@ Signed-off-by: Keith Holman keystone/tests/core.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/keystone/tests/core.py b/keystone/tests/core.py -index 860f68d..8e069fb 100644 ---- a/keystone/tests/core.py -+++ b/keystone/tests/core.py -@@ -75,9 +75,9 @@ from keystone.openstack.common import policy as common_policy # noqa - - LOG = logging.getLogger(__name__) +Index: git/keystone/tests/core.py +=================================================================== +--- git.orig/keystone/tests/core.py ++++ git/keystone/tests/core.py +@@ -68,9 +68,9 @@ + PID = six.text_type(os.getpid()) TESTSDIR = os.path.dirname(os.path.abspath(__file__)) + TESTCONF = os.path.join(TESTSDIR, 'config_files') -ROOTDIR = os.path.normpath(os.path.join(TESTSDIR, '..', '..')) +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 -@@ -380,7 +380,7 @@ class TestCase(NoModule, testtools.TestCase): + + def _calc_tmpdir(): +@@ -560,7 +560,7 @@ def _paste_config(self, config): if not config.startswith('config:'): test_path = os.path.join(TESTSDIR, config) @@ -39,6 +39,3 @@ index 860f68d..8e069fb 100644 for path in [test_path, etc_path]: if os.path.exists('%s-paste.ini' % path): return 'config:%s-paste.ini' % path --- -1.9.3 - diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb index 9360aae..190bb23 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb @@ -7,18 +7,17 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" PR = "r0" SRCNAME = "keystone" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://keystone.conf \ file://identity.sh \ file://keystone \ file://openrc \ file://keystone-search-in-etc-directory-for-config-files.patch \ - file://keystone-fix-location-of-files-for-tests.patch \ file://keystone-remove-git-commands-in-tests.patch \ " -SRCREV="a96d1a44bc0f074729c312e5c2a0f0875edf1765" -PV="2013.2.2+git${SRCPV}" +SRCREV="1070afe2cb8707ad28d43c4ea76116a941cf2131" +PV="2014.2.b1+git${SRCPV}" S = "${WORKDIR}/git" @@ -62,7 +61,9 @@ do_install_append() { install -d ${KEYSTONE_PACKAGE_DIR}/tests/tmp - sed -e "s:%KEYSTONE_PACKAGE_DIR%:${PYTHON_SITEPACKAGES_DIR}/keystone:g" -i ${KEYSTONE_PACKAGE_DIR}/tests/test_overrides.conf + if [ -e "${KEYSTONE_PACKAGE_DIR}/tests/test_overrides.conf" ];then + sed -e "s:%KEYSTONE_PACKAGE_DIR%:${PYTHON_SITEPACKAGES_DIR}/keystone:g" -i ${KEYSTONE_PACKAGE_DIR}/tests/test_overrides.conf + fi cp run_tests.sh ${KEYSTONE_CONF_DIR} } @@ -128,6 +129,8 @@ DEPENDS += " \ " RDEPENDS_${PN} += " \ + python-pycadf \ + python-oslo.db \ python-pam \ python-webob \ python-eventlet \ -- cgit v1.2.3-54-g00ecf