move ovs cleanup to tools/cleanup-host
- One of the usecase supported by tools/cleanup-containers was the ablity to remove container with a regex so that you could redepoloy just that single componet. - By cleaning up ovs in cleanup-containers that is nolonger possible. - This change move the cleanup of ovs from, tools/cleanup-contianers to tools/cleanup-hosts TrivialFix Change-Id: If2001130f4a2400555ce4d9ac5ee506482e4c25e
This commit is contained in:
parent
6417595b9f
commit
f0aa137a1d
@ -16,11 +16,6 @@ else
|
|||||||
egrep -v '(^\s*$)' | sort | uniq)
|
egrep -v '(^\s*$)' | sort | uniq)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Removing ovs bridge..."
|
|
||||||
(docker exec -u root neutron_openvswitch_agent neutron-ovs-cleanup \
|
|
||||||
--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \
|
|
||||||
--ovs_all_ports) > /dev/null
|
|
||||||
|
|
||||||
echo "Stopping containers..."
|
echo "Stopping containers..."
|
||||||
(docker stop -t 2 ${containers_to_kill} 2>&1) > /dev/null
|
(docker stop -t 2 ${containers_to_kill} 2>&1) > /dev/null
|
||||||
|
|
||||||
|
@ -27,6 +27,11 @@ ip -o link show | awk -F': ' '/vxlan/{print $2}' | while read -r ifname ; do
|
|||||||
ip link delete $ifname type vxlan
|
ip link delete $ifname type vxlan
|
||||||
done
|
done
|
||||||
|
|
||||||
|
echo "Removing ovs bridge..."
|
||||||
|
(docker exec -u root neutron_openvswitch_agent neutron-ovs-cleanup \
|
||||||
|
--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \
|
||||||
|
--ovs_all_ports) > /dev/null
|
||||||
|
|
||||||
# Keepalived leaves VIP on the host in case of accidental removal.
|
# Keepalived leaves VIP on the host in case of accidental removal.
|
||||||
# This snippet removes VIPs.
|
# This snippet removes VIPs.
|
||||||
if [[ "$enable_haproxy" == "yes" ]]; then
|
if [[ "$enable_haproxy" == "yes" ]]; then
|
||||||
@ -57,3 +62,4 @@ for dir in $FOLDER_PATH*; do
|
|||||||
rm -rfv $dir
|
rm -rfv $dir
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user