From f0aa137a1d4b3009fd0aa6dc4d1a1cd23fa72f89 Mon Sep 17 00:00:00 2001
From: Sean Mooney <sean.k.mooney@intel.com>
Date: Mon, 12 Sep 2016 20:34:59 +0100
Subject: [PATCH] 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
---
tools/cleanup-containers | 5 -----
tools/cleanup-host | 6 ++++++
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/tools/cleanup-containers b/tools/cleanup-containers
index 739621336..14249c960 100755
--- a/tools/cleanup-containers
+++ b/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
diff --git a/tools/cleanup-host b/tools/cleanup-host
index c50a3a287..59d463b22 100755
--- a/tools/cleanup-host
+++ b/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
+
--
GitLab