From d7fe5f8a2a27daa094585df1d2ce0772c28e457b Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Mon, 17 Nov 2014 17:59:10 -0500
Subject: core: update to juno 2014.2 + dependencies

syncing the core components to the latest juno hashes. We also introduce
new packages and update others to meet the juno requirements.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-openstack/recipes-devtools/python/python-barbican_git.bb     | 4 ++--
 meta-openstack/recipes-devtools/python/python-ceilometer_git.bb   | 2 +-
 meta-openstack/recipes-devtools/python/python-cinder_git.bb       | 2 +-
 .../recipes-devtools/python/python-dogpile.cache_0.5.3.bb         | 6 +++---
 meta-openstack/recipes-devtools/python/python-glance_git.bb       | 4 ++--
 meta-openstack/recipes-devtools/python/python-heat_git.bb         | 4 ++--
 meta-openstack/recipes-devtools/python/python-horizon_git.bb      | 2 +-
 .../recipes-devtools/python/python-keystone/keystone.conf         | 2 +-
 meta-openstack/recipes-devtools/python/python-keystone_git.bb     | 2 +-
 .../recipes-devtools/python/python-keystonemiddleware_git.bb      | 2 +-
 meta-openstack/recipes-devtools/python/python-netaddr_0.7.12.bb   | 8 ++++----
 meta-openstack/recipes-devtools/python/python-neutron_git.bb      | 2 +-
 meta-openstack/recipes-devtools/python/python-nova_git.bb         | 6 ++++--
 meta-openstack/recipes-devtools/python/python-oslo.db_1.0.2.bb    | 4 ++--
 meta-openstack/recipes-devtools/python/python-oslo.i18n_1.0.0.bb  | 4 ++--
 meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb   | 4 ++--
 meta-openstack/recipes-devtools/python/python-pycadf_0.6.0.bb     | 4 ++--
 meta-openstack/recipes-devtools/python/python-swift_git.bb        | 4 ++--
 18 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-barbican_git.bb b/meta-openstack/recipes-devtools/python/python-barbican_git.bb
index 469b1f7..5e74b65 100644
--- a/meta-openstack/recipes-devtools/python/python-barbican_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-barbican_git.bb
@@ -15,8 +15,8 @@ SRC_URI = "git://github.com/openstack/barbican.git;branch=master \
            file://barbican-handle-white-space-in-date-strings.patch \
           "
 
-SRCREV="1000ca44f264b09c0347ac56815a4f0ef02cf0eb"
-PV="2014.2.rc1+git${SRCPV}"
+SRCREV="c171f491014ef504e05a3e86877e28763e72452f"
+PV="2014.2+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 inherit update-rc.d setuptools identity hosts useradd default_configs openstackchef monitor
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
index 88c21cc..0ab5874 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
@@ -16,7 +16,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
 #   file://ceilometer-builtin-tests-config-location.patch
 
 
-SRCREV="42c3d487aac5d383f5224ffc4d402387562895df"
+SRCREV="1c8e3dea7cf53b25f2b3ac4a06bcbc1787d6673b"
 PV="2014.2.rc1+git${SRCPV}"
 S = "${WORKDIR}/git"
 
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
index 0f20bc8..7dfc283 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
@@ -20,7 +20,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
     file://cinder-builtin-tests-config-location.patch \
 	"
 
-SRCREV="9ba3603d8f2cf33b33265012b2cb2480eba7b35a"
+SRCREV="37e4a12652c803d60c18079b735d96e5c7890f07"
 PV="2014.2.rc1+git${SRCPV}"
 S = "${WORKDIR}/git"
 
diff --git a/meta-openstack/recipes-devtools/python/python-dogpile.cache_0.5.3.bb b/meta-openstack/recipes-devtools/python/python-dogpile.cache_0.5.3.bb
index 3e2a65c..f241c83 100644
--- a/meta-openstack/recipes-devtools/python/python-dogpile.cache_0.5.3.bb
+++ b/meta-openstack/recipes-devtools/python/python-dogpile.cache_0.5.3.bb
@@ -2,15 +2,15 @@ DESCRIPTION = "Python Dogpile Cache: A caching front-end based on the Dogpile lo
 HOMEPAGE = "https://pypi.python.org/pypi/dogpile.cache"
 SECTION = "devel/python"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0401fd56584d7b3d4be91690672ec433"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=db99dd669263339f22dfc735801942ad"
 
 PR = "r0"
 SRCNAME = "dogpile.cache"
 
 SRC_URI = "https://pypi.python.org/packages/source/d/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "604872aa7036ffc205c14160b5e83f99"
-SRC_URI[sha256sum] = "1f3165222bc23418cb9d3f1a2c9d554a091f412e5bc871ea0c48a19b576d06c0"
+SRC_URI[md5sum] = "e178b84bafb8e2da0be939f38db60689"
+SRC_URI[sha256sum] = "2fe8c1a329830a9ada865a69cc5ebb2c2e6f2dbda3a6d4dbf5155c7d5194344b"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb
index fd884b5..932ca5d 100644
--- a/meta-openstack/recipes-devtools/python/python-glance_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb
@@ -14,8 +14,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
 
 # removed. juno uses store library: file://0001-glance-store-only-load-known-stores-not-all-stores.patch
 
-SRCREV="675a39a74faad5f7fe4eb94e1dcf7f4359ed2285"
-PV="2014.2.rc1+git${SRCPV}"
+SRCREV="453706b4b3a3d6d9c3b154a1fde59c34fc30234b"
+PV="2014.2+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb
index 9c1ecae..f473338 100644
--- a/meta-openstack/recipes-devtools/python/python-heat_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb
@@ -16,8 +16,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
            file://heat-tests-change-project_dir-path.patch \
 "
 
-SRCREV="4a8cb4b2041edfa4a166b0a5dd7566874cf7c6f2"
-PV="2014.2.rc1+git${SRCPV}"
+SRCREV="2a91c1569d34b4e735e7cb2705b4cf663b3f5998"
+PV="2014.2+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-templates ${SRCNAME}-cfn"
diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
index 542e553..7969383 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
@@ -66,7 +66,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
     file://horizon-use-full-package-path-to-test-directories.patch \
     "
 
-SRCREV="123840a43aaeff05becc08044b9cc33977ece2bb"
+SRCREV="bb7fa11c7688c8d43b8fb71540d32f1908b8da5e"
 PV="2014.2.rc1+git${SRCPV}"
 S = "${WORKDIR}/git"
 
diff --git a/meta-openstack/recipes-devtools/python/python-keystone/keystone.conf b/meta-openstack/recipes-devtools/python/python-keystone/keystone.conf
index 55bf6e8..0ab1c3f 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone/keystone.conf
+++ b/meta-openstack/recipes-devtools/python/python-keystone/keystone.conf
@@ -108,7 +108,7 @@ connection = postgresql://%DB_USER%:%DB_PASSWORD%@localhost/keystone
 
 [token]
 # driver = keystone.token.backends.kvs.Token
-driver = keystone.token.backends.sql.Token
+driver = keystone.token.persistence.backends.sql.Token
 
 # Amount of time a token should remain valid (in seconds)
 # expiration = 86400
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
index 18f77ef..f71c222 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
@@ -18,7 +18,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
            file://wsgi-keystone.conf \
            "
 
-SRCREV="b276f3dbc9ef1a6b2bd952c88eb45fde9b646f68"
+SRCREV="2b7fdb1ab5de54c2a610a0ee9fc635ddb81e7b38"
 PV="2014.2.rc1+git${SRCPV}"
 
 S = "${WORKDIR}/git"
diff --git a/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb b/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb
index 26bba6d..50cfd44 100644
--- a/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb
@@ -12,7 +12,7 @@ SRC_URI = "\
 	"
 
 PV="1.2.0+git${SRCPV}"
-SRCREV="4434a77e7c679dcad1db67fba4459afa4c5c7c67"
+SRCREV="671285f4e62b59a003169313be3ae032175d9a1e"
 S = "${WORKDIR}/git"
 
 inherit setuptools
diff --git a/meta-openstack/recipes-devtools/python/python-netaddr_0.7.12.bb b/meta-openstack/recipes-devtools/python/python-netaddr_0.7.12.bb
index a09243a..037df88 100644
--- a/meta-openstack/recipes-devtools/python/python-netaddr_0.7.12.bb
+++ b/meta-openstack/recipes-devtools/python/python-netaddr_0.7.12.bb
@@ -2,15 +2,15 @@ DESCRIPTION = "A library for network address representation and manipulation"
 HOMEPAGE = "https://github.com/drkjam/netaddr"
 SECTION = "devel/python"
 LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=64c24df6c6be03cf388a97f707e8405e"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e0c5cc28e66c19626bc908b3a9402c2e"
 
 PR = "r0"
 SRCNAME = "netaddr"
 
-SRC_URI = "https://github.com/downloads/drkjam/${SRCNAME}/${SRCNAME}-${PV}.zip"
+SRC_URI = "https://pypi.python.org/packages/source/n/${SRCNAME}/${SRCNAME}-${PV}.zip"
 
-SRC_URI[md5sum] = "5ffc5ca81294cb76c0c89bc2bdd43912"
-SRC_URI[sha256sum] = "c17969b5522a48fee018970b0aa8104b088ebb97eabf3e11935845caabbcf3a0"
+SRC_URI[md5sum] = "6145afd46786ffbc6644ae1ea2bfefd7"
+SRC_URI[sha256sum] = "622b81e571fb974698d056d4825b21ee64eac96de8ef41327b03913ac4308d5b"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
index 8ecd4d3..6f72b60 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
@@ -18,7 +18,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
            file://uuid_wscheck.patch \
            file://neutron-test-nec-plugin-extensions-location.patch \
 	  "
-SRCREV="90a9e588052c1f96d9f3f0d63de3bdfa3c5b8656"
+SRCREV="49234a824c16164a56cbfbf644490d07bb22e241"
 PV="2014.2.rc1+git${SRCPV}"
 
 S = "${WORKDIR}/git"
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index d68725b..929adff 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -26,8 +26,8 @@ SRC_URI += "file://nova-all \
             file://nova.conf \
             file://openrc \
            "
-SRCREV="ba0a08c11535a9cedc07e1329e8bf729af3d4b02"
-PV="2014.2.rc1+git${SRCPV}"
+SRCREV="943f02f1a62f7eb131f62729d83d97ad431ee89f"
+PV="2014.2+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
@@ -294,6 +294,8 @@ RDEPENDS_${PN} = " libvirt \
 		   python-netaddr \
 		   python-oslo.config \
 		   python-oslo.rootwrap \
+		   python-oslo.concurrency \
+		   python-oslo.middleware \
 		   python-paste \
 		   python-pastedeploy \
 		   python-paramiko \
diff --git a/meta-openstack/recipes-devtools/python/python-oslo.db_1.0.2.bb b/meta-openstack/recipes-devtools/python/python-oslo.db_1.0.2.bb
index bbee63b..c026c92 100644
--- a/meta-openstack/recipes-devtools/python/python-oslo.db_1.0.2.bb
+++ b/meta-openstack/recipes-devtools/python/python-oslo.db_1.0.2.bb
@@ -9,8 +9,8 @@ PR = "r0"
 SRCNAME = "oslo.db"
 SRC_URI = "http://pypi.python.org/packages/source/o/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "2c7300e9f64b3ea54f56c9f04ff7d004"
-SRC_URI[sha256sum] = "6ffdb57913fd56579d55b4154526b1e2a61d728b4c29b4dd7c0b8272c1ac2e1c"
+SRC_URI[md5sum] = "6c87294ce18252bef17e2552bc19a40c"
+SRC_URI[sha256sum] = "7092525eab0352748fc0c58a7facd3d6ae967d9130589b4afc12bfa171bee837"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/meta-openstack/recipes-devtools/python/python-oslo.i18n_1.0.0.bb b/meta-openstack/recipes-devtools/python/python-oslo.i18n_1.0.0.bb
index ff32869..12c2428 100644
--- a/meta-openstack/recipes-devtools/python/python-oslo.i18n_1.0.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-oslo.i18n_1.0.0.bb
@@ -9,8 +9,8 @@ PR = "r0"
 SRCNAME = "oslo.i18n"
 SRC_URI = "http://pypi.python.org/packages/source/o/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "7a4e9139c8d0a28bb07ff4c4ec1218cb"
-SRC_URI[sha256sum] = "c682a261de6b0d75291478c422e9ff75c220fa5e58856735d988c09bf14773bb"
+SRC_URI[md5sum] = "24da570b208afd3cc569cbcdb169835b"
+SRC_URI[sha256sum] = "008f86bc297ee05c63b1e2e4a85985802f086c81b16b0853e8e47df0592b23bc"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb
index 557c107..18c1504 100644
--- a/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb
@@ -9,8 +9,8 @@ PR = "r0"
 SRCNAME = "oslo.utils"
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git"
 
-PV = "0.2.0"
-SRCREV = "118f7ea84a476604f2498fc4d28c9c2b266c717a"
+PV = "1.0.0"
+SRCREV = "f0cce3cd2635b06f8220a1ebe096495006d739bf"
 S = "${WORKDIR}/git"
 
 inherit setuptools
diff --git a/meta-openstack/recipes-devtools/python/python-pycadf_0.6.0.bb b/meta-openstack/recipes-devtools/python/python-pycadf_0.6.0.bb
index 7e80309..6762b6c 100644
--- a/meta-openstack/recipes-devtools/python/python-pycadf_0.6.0.bb
+++ b/meta-openstack/recipes-devtools/python/python-pycadf_0.6.0.bb
@@ -9,8 +9,8 @@ PR = "r0"
 SRCNAME = "pycadf"
 SRC_URI = "http://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "0386d95acb2045231fbcbe12fcaa2779"
-SRC_URI[sha256sum] = "3f88f1c5ea7db093261afb2fd5a235b3dff540d9e93fde5a01a577222b33723c"
+SRC_URI[md5sum] = "283ff62801098f499e37aa493c1d18bb"
+SRC_URI[sha256sum] = "9ba1e9ac52ee2a2d6d9cc89847323559cc2ffe7b4d80b703944a0a1f75c7093f"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/meta-openstack/recipes-devtools/python/python-swift_git.bb b/meta-openstack/recipes-devtools/python/python-swift_git.bb
index 7241be9..935b9fb 100644
--- a/meta-openstack/recipes-devtools/python/python-swift_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-swift_git.bb
@@ -16,8 +16,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
            file://cluster.conf \
 "
 
-SRCREV="6986f7272ce6b4ada209bc84f1da19602c9e6b83"
-PV="2.2.0.rc1+git${SRCPV}"
+SRCREV="709187b54ff2e9b81ac53977d4283523ce16af38"
+PV="2.2.0+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 inherit setuptools python-dir update-rc.d hosts identity openstackchef
-- 
cgit v1.2.3-54-g00ecf