summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-neutron_git.bb
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2015-04-20 16:09:26 +0800
committerBruce Ashfield <bruce.ashfield@windriver.com>2015-04-21 21:09:33 -0400
commit327ac77674d70d6bba2f17434dab787da0fec847 (patch)
tree98d4de32125ffe0561216f037148cd0fa9cf93c8 /meta-openstack/recipes-devtools/python/python-neutron_git.bb
parent9a75a28fd56f345960155cb47cf79e08cd05e161 (diff)
downloadmeta-cloud-services-327ac77674d70d6bba2f17434dab787da0fec847.tar.gz
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 <jackie.huang@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-neutron_git.bb')
-rw-r--r--meta-openstack/recipes-devtools/python/python-neutron_git.bb7
1 files changed, 2 insertions, 5 deletions
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 \
15 file://metadata_agent.ini \ 15 file://metadata_agent.ini \
16 file://neutron-dhcp-agent-netns-cleanup.cron \ 16 file://neutron-dhcp-agent-netns-cleanup.cron \
17 file://0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch \ 17 file://0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch \
18 file://neutron-test-nec-plugin-extensions-location.patch \
19 " 18 "
20 19
21# TBD: update or drop 20# TBD: update or drop
22# file://uuid_wscheck.patch 21# file://uuid_wscheck.patch
23 22
24SRCREV="1948efa261e47b08e2cde4828321614ee6e169be" 23SRCREV = "e86077e8452891cc176841dd6b6316831e12abc1"
25PV="2015.1.0b2+git${SRCPV}" 24PV = "2015.1.0b3+git${SRCPV}"
26 25
27S = "${WORKDIR}/git" 26S = "${WORKDIR}/git"
28 27
@@ -137,8 +136,6 @@ do_install_append() {
137 sed -i '/\[keystone_authtoken\]/aidentity_uri=http://127.0.0.1:8081/keystone/admin/' ${NEUTRON_CONF_DIR}/neutron.conf 136 sed -i '/\[keystone_authtoken\]/aidentity_uri=http://127.0.0.1:8081/keystone/admin/' ${NEUTRON_CONF_DIR}/neutron.conf
138 137
139 cp run_tests.sh ${NEUTRON_CONF_DIR} 138 cp run_tests.sh ${NEUTRON_CONF_DIR}
140
141 sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/tests/unit/nec/test_nec_plugin.py
142} 139}
143 140
144pkg_postinst_${SRCNAME}-setup () { 141pkg_postinst_${SRCNAME}-setup () {