1 files changed, 6 insertions, 6 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
index 51c2ac4..454f51d 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
@@ -6,21 +6,20 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
 SRCNAME = "neutron"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/newton \
            file://neutron-server.init \
            file://neutron-agent.init \
            file://l3_agent.ini \
            file://dhcp_agent.ini \
            file://metadata_agent.ini \
            file://neutron-dhcp-agent-netns-cleanup.cron \
-           file://0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch \
           "
 
 # TBD: update or drop
 # file://uuid_wscheck.patch
 
-SRCREV = "6dcfe3a9362ae5fcf18e5cfb59663e43446cd59c"
-PV = "7.0.0+git${SRCPV}"
+SRCREV = "e4aac689002645b837c12f23470fea5e61600a21"
+PV = "9.3.1+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
@@ -46,16 +45,17 @@ python () {
 }
 
 do_install_append() {
-    TEMPLATE_CONF_DIR=${S}${sysconfdir}/
+    TEMPLATE_CONF_DIR=${S}${sysconfdir}/oslo-config-generator
     NEUTRON_CONF_DIR=${D}${sysconfdir}/neutron
 
     install -d ${NEUTRON_CONF_DIR}
     install -d ${NEUTRON_CONF_DIR}/plugins/ml2
 
     install -m 600 ${TEMPLATE_CONF_DIR}/neutron.conf ${NEUTRON_CONF_DIR}/
+    #touch ${NEUTRON_CONF_DIR}/neutron.conf
     install -m 600 ${S}/etc/api-paste.ini ${NEUTRON_CONF_DIR}/
     install -m 600 ${S}/etc/policy.json ${NEUTRON_CONF_DIR}/
-    install -m 600 ${TEMPLATE_CONF_DIR}/neutron/plugins/ml2/* ${NEUTRON_CONF_DIR}/plugins/ml2
+    install -m 600 ${TEMPLATE_CONF_DIR}/ml2* ${NEUTRON_CONF_DIR}/plugins/ml2
 
     # Neutron.conf config changes (replace with .ini file editing)
     sed -e "s:^# core_plugin.*:core_plugin = ml2:g" -i ${NEUTRON_CONF_DIR}/neutron.conf