openstack
/
tripleo-image-elements
Code Issues Proposed changes

Change the kill_metadata executable strings in Neutron 

The scripts 80-neutron-dhcp-agent and 80-neutron-router modifies
the neutron rootwrap filter files l3.filters and dhcp.filters.
They replaces the string "/usr/bin/python" with the path to
the python found in the NEUTRON_VENV_DIR/bin directory.

The neutron patch https://review.openstack.org/#/c/118296
replaced "/usr/bin/python" with "python" in the kill_metadata
filters. As a result, the 80-neutron-dhcp-agent and 80-neutron-
router scripts need to be modified to make the same replacement
of "/usr/bin/python" with "python".

If this were not corrected, the neutron L3 agent will get a
rootwrap error (no filters matched) when it tries to kill a
metadata-proxy process and caused the cleanup of a deleted
router to fail.

Closes-Bug: #1398591
Change-Id: Id520ea27f2803447eff654d14ba8cbb388502a52
This commit is contained in:
Stephen Ma 2014-12-02 22:47:52 +00:00
parent 4369880848
commit d1c9cbebe5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/neutron-dhcp-agent/install.d/neutron-source-install/80-neutron-dhcp-agent
View File

@ -4,7 +4,7 @@ set -eux
# kill processes when networks are deleted.
if [ -n "${NEUTRON_VENV_DIR}" ]
then
sed -i "s, /usr/bin/python, ${NEUTRON_VENV_DIR}/bin/python," /etc/neutron/rootwrap.d/dhcp.filters
sed -i "s, python, ${NEUTRON_VENV_DIR}/bin/python," /etc/neutron/rootwrap.d/dhcp.filters
fi
install-packages dnsmasq dnsmasq-utils

2
elements/neutron-router/install.d/neutron-source-install/80-neutron-router
View File

@ -5,7 +5,7 @@ set -eux
# kill metadata-proxy processes when routers are deleted.
if [ -n "${NEUTRON_VENV_DIR}" ]
then
sed -i "s, /usr/bin/python, ${NEUTRON_VENV_DIR}/bin/python," /etc/neutron/rootwrap.d/l3.filters
sed -i "s, python, ${NEUTRON_VENV_DIR}/bin/python," /etc/neutron/rootwrap.d/l3.filters
fi
os-svc-daemon -i "$NEUTRON_VENV_DIR" -n neutron-l3-agent -u neutron -c neutron-l3-agent -- --config-file /etc/neutron/l3_agent.ini --config-dir /etc/neutron