diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-neutron_git.bb')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-neutron_git.bb | 7 |
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 | ||
| 24 | SRCREV="1948efa261e47b08e2cde4828321614ee6e169be" | 23 | SRCREV = "e86077e8452891cc176841dd6b6316831e12abc1" |
| 25 | PV="2015.1.0b2+git${SRCPV}" | 24 | PV = "2015.1.0b3+git${SRCPV}" |
| 26 | 25 | ||
| 27 | S = "${WORKDIR}/git" | 26 | S = "${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 | ||
| 144 | pkg_postinst_${SRCNAME}-setup () { | 141 | pkg_postinst_${SRCNAME}-setup () { |
