diff options
| -rwxr-xr-x | docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh | 5 | ||||
| -rwxr-xr-x | docker/neutron/neutron-agents/config-scripts/config-l3-agent.sh | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh b/docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh index 08d2b21b1..f9f0d3bce 100755 --- a/docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh +++ b/docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh @@ -77,5 +77,10 @@ dhcp-option-force=26,1450 log-facility=${NEUTRON_LOG_DIR}/neutron-dnsmasq.log EOF +# Remove any existing qdhcp namespaces +ip netns list | grep qdhcp | while read -r line ; do + ip netns delete $line +done + # Start DHCP Agent exec /usr/bin/neutron-dhcp-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini diff --git a/docker/neutron/neutron-agents/config-scripts/config-l3-agent.sh b/docker/neutron/neutron-agents/config-scripts/config-l3-agent.sh index 5f88869d2..bc9692c04 100755 --- a/docker/neutron/neutron-agents/config-scripts/config-l3-agent.sh +++ b/docker/neutron/neutron-agents/config-scripts/config-l3-agent.sh @@ -76,5 +76,10 @@ elif [ "${USE_NAMESPACES}" == "true" ] ; then "true" fi +# Remove any existing qrouter namespaces +ip netns list | grep qrouter | while read -r line ; do + ip netns delete $line +done + # Start L3 Agent exec /usr/bin/neutron-l3-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/fwaas_driver.ini |