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

tools/cleanup-containers

@@ -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
 

tools/cleanup-host

@@ -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
+