Fix l3.filters and dhcp.filters file for tripleo installations
This change addresses a rootwrap filter issue specific to the l3-agent and dhcp-agent in a tripleo deployment. The location of the python executable used in starting processes within a tripleo deployment may be different than the /usr/bin/python location that is used for the KillFilter in l3.filters and dhcp.filters. Closes-Bug: #1272816 Change-Id: I4c78b074e298f49eae559c7ca451fa7f9fec5970
This commit is contained in:
parent
ead65b6336
commit
6a2f87c169
@ -1,5 +1,11 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -eux
|
set -eux
|
||||||
|
# If NEUTRON_VENV_DIR is set, then need to fix up the dhcp.filters rootwrap file to allow dhcp-agent to
|
||||||
|
# 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
|
||||||
|
fi
|
||||||
|
|
||||||
install-packages dnsmasq dnsmasq-utils
|
install-packages dnsmasq dnsmasq-utils
|
||||||
|
|
||||||
|
@ -1,6 +1,13 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -eux
|
set -eux
|
||||||
|
|
||||||
|
# If NEUTRON_VENV_DIR is set, then need to fix up the l3.filters rootwrap file to allow l3-agent to
|
||||||
|
# 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
|
||||||
|
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
|
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
|
||||||
os-svc-daemon -i "$NEUTRON_VENV_DIR" -n neutron-metadata-agent -u neutron -c neutron-metadata-agent -- --config-file /etc/neutron/metadata_agent.ini --config-dir /etc/neutron
|
os-svc-daemon -i "$NEUTRON_VENV_DIR" -n neutron-metadata-agent -u neutron -c neutron-metadata-agent -- --config-file /etc/neutron/metadata_agent.ini --config-dir /etc/neutron
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user