neutron: update to icehouse/stable

Updating neutron to the icehouse/stable branch.

As part of this change, we lay the ground work for better VIF reporting.

The configuration files, which are slightly out of date, support basic
operations, so we keep them the same .. for now.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
index 6deb0d3..5ac0fd2 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 PR = "r0"
 SRCNAME = "neutron"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/icehouse \
            file://ovs_neutron_plugin.ini \
            file://linuxbridge_conf.ini \
            file://neutron-server.init \
@@ -15,9 +15,10 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
            file://l3_agent.ini \
            file://dhcp_agent.ini \
            file://neutron-dhcp-agent-netns-cleanup.cron \
+           file://0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch \
           "
-SRCREV="8cb9d895675f2a89c6b741da4b594f416fbeee5a"
-PV="2013.2.2+git${SRCPV}"
+SRCREV="e0deffc71e5031059530b9b6c2ef3b0765de3d10"
+PV="2014.1+git${SRCPV}"
 
 S = "${WORKDIR}/git"