From 327ac77674d70d6bba2f17434dab787da0fec847 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 20 Apr 2015 16:09:26 +0800 Subject: python-neutron: upgrade to 2015.1.0b3 Removed the patch neutron-test-nec-plugin-extensions-location.patch since the main codes and unit tests of NEC plugin had been removed. Signed-off-by: Jackie Huang Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-devtools/python/python-neutron_git.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'meta-openstack/recipes-devtools/python/python-neutron_git.bb') diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb index 1a5a9b2..3c64d61 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb @@ -15,14 +15,13 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://metadata_agent.ini \ file://neutron-dhcp-agent-netns-cleanup.cron \ file://0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch \ - file://neutron-test-nec-plugin-extensions-location.patch \ " # TBD: update or drop # file://uuid_wscheck.patch -SRCREV="1948efa261e47b08e2cde4828321614ee6e169be" -PV="2015.1.0b2+git${SRCPV}" +SRCREV = "e86077e8452891cc176841dd6b6316831e12abc1" +PV = "2015.1.0b3+git${SRCPV}" S = "${WORKDIR}/git" @@ -137,8 +136,6 @@ do_install_append() { sed -i '/\[keystone_authtoken\]/aidentity_uri=http://127.0.0.1:8081/keystone/admin/' ${NEUTRON_CONF_DIR}/neutron.conf cp run_tests.sh ${NEUTRON_CONF_DIR} - - sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/tests/unit/nec/test_nec_plugin.py } pkg_postinst_${SRCNAME}-setup () { -- cgit v1.2.3-54-g00ecf