openstack/kolla-ansible
Code Issues Proposed changes

Merge "move ovs cleanup to tools/cleanup-host"

Browse Source
This commit is contained in:
Jenkins 2016-09-13 14:44:26 +00:00 committed by Gerrit Code Review
commit 7db277b145
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/cleanup-containers
View File

@ -16,11 +16,6 @@ else
egrep -v '(^\s*$)' | sort | uniq)
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..."
(docker stop -t 2 ${containers_to_kill} 2>&1) > /dev/null

6
tools/cleanup-host
View File

@ -27,6 +27,11 @@ ip -o link show | awk -F': ' '/vxlan/{print $2}' | while read -r ifname ; do
ip link delete $ifname type vxlan
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.
# This snippet removes VIPs.
if [[ "$enable_haproxy" == "yes" ]]; then
@ -57,3 +62,4 @@ for dir in $FOLDER_PATH*; do
rm -rfv $dir
fi
done