glance: uprev to Liberty

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

3 files changed, 30 insertions, 10 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb
index 79235af..e6f5f5f 100644
--- a/meta-openstack/recipes-devtools/python/python-glance_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb
@@ -4,18 +4,17 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
-PR = "r0"
 SRCNAME = "glance"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
            file://glance.init \
            "
 
 # removed. juno uses store library: file://0001-glance-store-only-load-known-stores-not-all-stores.patch
 #                                   file://glance-change-builtin-tests-config-location.patch
 
-SRCREV = "93b0d5fce3a41e4a3a549f98f78b6681cbc3ea95"
-PV = "2015.1.0+git${SRCPV}"
+SRCREV = "69516fad5f651a085a047a337a05c58b39023c1b"
+PV = "11.0.0+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
@@ -150,7 +149,10 @@ pkg_postinst_${SRCNAME}-setup () {
 PACKAGES += " ${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-registry"
 ALLOW_EMPTY_${SRCNAME}-setup = "1"
 
-FILES_${PN} = "${libdir}/*"
+FILES_${PN} = " \
+    ${libdir}/* \
+    ${datadir}/etc/${SRCNAME}* \
+    "
 
 FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh"
 
@@ -201,6 +203,25 @@ RDEPENDS_${PN} += "python-greenlet \
         python-enum34 \
         python-semantic-version \
         python-oslo.vmware \
+        python-oslo.concurrency \
+        python-oslo.context \
+        python-oslo.service \
+        python-oslo.utils \
+        python-stevedore \
+        python-futurist \
+        python-taskflow \
+        python-keystonemiddleware \
+        python-wsme \
+        python-pyopenssl \
+        python-six \
+        python-oslo.db \
+        python-oslo.log \
+        python-oslo.messaging  \
+        python-oslo.middleware \
+        python-oslo.policy \
+        python-oslo.serialization \
+        python-castellan \
+        python-cryptography \
         "
 
 RDEPENDS_${SRCNAME} = "${PN} \
diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
index ab32be8..f9edf6d 100644
--- a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
@@ -9,9 +9,8 @@ DEPENDS += " \
         python-pbr \
         "
 
-SRCREV = "db6420b44779411d6d1f238f6b887f83f1988986"
-PV = "0.19.0+git${SRCPV}"
-PR = "r0"
+SRCREV = "86635868c1eb3aec0c065c12cb9928c613940f36"
+PV = "1.1.0+git${SRCPV}"
 
 SRC_URI = "\
         git://github.com/openstack/${BPN}.git;protocol=https \
diff --git a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb
index 932c5d9..0abf521 100644
--- a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb
@@ -4,8 +4,8 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
-SRCREV = "ea88e503b617a7ac9a0ae7e537d6517e9992a104"
-PV = "0.4.0+git${SRCPV}"
+SRCREV = "c816b38d9f12be75d989409cbab6dfefa8f49dc3"
+PV = "0.9.1+git${SRCPV}"
 
 SRC_URI = "\
         git://github.com/openstack/glance_store.git \