neutron: uprev to Liberty

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

2 files changed, 56 insertions, 38 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
index b9cf518..cadc80f 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
 SRCNAME = "neutron"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
            file://neutron-server.init \
            file://neutron-agent.init \
            file://l3_agent.ini \
@@ -19,8 +19,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
 # TBD: update or drop
 # file://uuid_wscheck.patch
 
-SRCREV = "7260e0e3fc2ea479e80e0962624aca7fd38a1f60"
-PV = "2015.1.0+git${SRCPV}"
+SRCREV = "6dcfe3a9362ae5fcf18e5cfb59663e43446cd59c"
+PV = "7.0.0+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
@@ -258,30 +258,44 @@ DEPENDS += " \
         python-pbr \
         "
 
-RDEPENDS_${PN} += "python-paste \
-        python-pastedeploy \
-        python-routes \
-        python-amqplib \
-        python-anyjson \
-        python-alembic \
-        python-eventlet \
-        python-greenlet \
-        python-httplib2 \
-        python-iso8601 \
-        python-kombu \
-        python-netaddr \
-        python-neutronclient \
-        python-sqlalchemy \
-        python-webob \
-        python-keystoneclient \
-        python-oslo.config \
-        python-oslo.rootwrap \
-        python-pyudev \
-        python-novaclient \
-        python-mako \
-        python-markupsafe \
-        python-pyparsing \
-        python-pbr \
+RDEPENDS_${PN} += " \
+        python-pbr \
+        python-paste \
+        python-pastedeploy \
+        python-debtcollector \
+        python-eventlet \
+        python-pecan \
+        python-greenlet \
+        python-httplib2 \
+        python-requests \
+        python-jinja2 \
+        python-keystonemiddleware \
+        python-netaddr \
+        python-neutronclient \
+        python-retrying \
+        python-ryu \
+        python-sqlalchemy \
+        python-webob \
+        python-keystoneclient \
+        python-alembic \
+        python-six \
+        python-stevedore \
+        python-oslo.concurrency \
+        python-oslo.config \
+        python-oslo.context \
+        python-oslo.db \
+        python-oslo.i18n \
+        python-oslo.log \
+        python-oslo.messaging \
+        python-oslo.middleware \
+        python-oslo.policy \
+        python-oslo.rootwrap \
+        python-oslo.serialization \
+        python-oslo.service \
+        python-oslo.utils \
+        python-oslo.versionedobjects \
+        python-novaclient \
+        python-routes \
         "
 
 RDEPENDS_${SRCNAME} = "${PN} \
diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
index 16a2e92..bcbefaa 100644
--- a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
@@ -9,24 +9,28 @@ DEPENDS += " \
         python-pbr \
         "
 
-RDEPENDS_${PN} +="python-cliff \
-        python-httplib2 \
-        python-iso8601 \
-        python-prettytable \
-        python-pyparsing \
-        python-simplejson \
-        python-pbr \
+RDEPENDS_${PN} +="\
+        python-pbr \
+        python-cliff \
+        python-iso8601 \
+        python-netaddr \
+        python-oslo.i18n \
+        python-oslo.serialization \
+        python-oslo.utils \
+        python-requests \
+        python-keystoneclient \
+        python-simplejson \
+        python-six \
+        python-babel \
         "
 
-PR = "r0"
-
 SRC_URI = "git://github.com/openstack/python-neutronclient.git;branch=master \
            file://neutronclient-use-csv-flag-instead-of-json.patch \
            file://neutron-api-check.sh \
           "
 
-PV = "2.4.0+git${SRCPV}"
-SRCREV = "aa1215a5ad063b299d32ef319eb63d5210249a9b"
+PV = "3.1.0+git${SRCPV}"
+SRCREV = "3e115991c1cf9ec7cf4252440fa8d6015a5f53ce"
 S = "${WORKDIR}/git"
 
 inherit setuptools monitor rmargparse