glance: uprev to Liberty

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

1 files changed, 26 insertions, 5 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} \