From a833f549270c3707fb6521b0571c23e76e0ecc9b Mon Sep 17 00:00:00 2001
From: Mark Asselstine <mark.asselstine@windriver.com>
Date: Wed, 3 Feb 2016 20:41:43 -0500
Subject: keystone: uprev to Liberty

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../recipes-devtools/python/python-keystone_git.bb          | 13 +++++++------
 .../recipes-devtools/python/python-keystoneclient_git.bb    |  6 +++---
 .../python/python-keystonemiddleware_git.bb                 |  5 ++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
index 58aa449..a8d1181 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
 SRCNAME = "keystone"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
            file://keystone.conf \
            file://identity.sh \
            file://keystone \
@@ -19,8 +19,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
 # file://keystone-remove-git-commands-in-tests.patch 
 # file://keystone-explicitly-import-localcontext-from-oslo.me.patch
 
-SRCREV = "5d3b31f9c3d34599ff8a83eeb7530fc6e0b1b67b"
-PV = "2015.1.0+git${SRCPV}"
+SRCREV = "8dcd82fb9c76d43f26338bee293b32f4af473ad9"
+PV = "8.0.0+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
@@ -144,9 +144,6 @@ do_install_append() {
             -i ${KEYSTONE_PACKAGE_DIR}/tests/test_overrides.conf
     fi
 
-    cp run_tests.sh ${KEYSTONE_CONF_DIR}
-
-
     if ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)};
     then
         sed -i -e '/^\[identity\]/a \
@@ -287,6 +284,10 @@ RDEPENDS_${PN} += " \
         python-fixtures \
         python-oslotest \
         python-functools32 \
+        python-six \
+        python-routes \
+        python-pycadf \
+        python-cryptography \
         "
 
 RDEPENDS_${SRCNAME}-tests += " bash"
diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
index f4810e5..495f1e3 100644
--- a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
@@ -4,7 +4,6 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4a4d0e932ffae1c0131528d30d419c55"
 
-PR = "r0"
 SRCNAME = "keystoneclient"
 
 SRC_URI = "\
@@ -13,8 +12,8 @@ SRC_URI = "\
 	file://keystone-api-check.sh \
 	"
 
-PV = "1.6.0+git${SRCPV}"
-SRCREV = "f6ab133f25f00e041cd84aa8bbfb422594d1942f"
+PV = "1.7.1+git${SRCPV}"
+SRCREV = "28138b588224c6b0503620ac2e24bd37dad25370"
 S = "${WORKDIR}/git"
 
 inherit setuptools monitor rmargparse
@@ -34,6 +33,7 @@ RDEPENDS_${PN} += " \
 	python-oslo.config \
 	python-oslo.serialization \
 	python-pbr \
+	python-argparse \
 	"
 
 PACKAGECONFIG ?= "bash-completion"
diff --git a/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb b/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb
index 35c5b49..50d3d95 100644
--- a/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb
@@ -4,15 +4,14 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4a4d0e932ffae1c0131528d30d419c55"
 
-PR = "r0"
 SRCNAME = "keystonemiddleware"
 
 SRC_URI = "\
 	git://git.openstack.org/openstack/keystonemiddleware;branch=master \
 	"
 
-PV = "1.6.1+git${SRCPV}"
-SRCREV = "6ff732b3893a7e71f7b9a7318e8a4daaf906ebbf"
+PV = "2.3.0+git${SRCPV}"
+SRCREV = "62805857ea39710ba14ab9a4e6c606dc336c6b56"
 S = "${WORKDIR}/git"
 
 inherit setuptools
-- 
cgit v1.2.3-54-g00ecf