From cf2ff03d60f1282c920bb5dd4edec37fa6216ced Mon Sep 17 00:00:00 2001 From: luyao Date: Tue, 23 Aug 2016 10:55:52 +0800 Subject: [PATCH] TrivialFix: Delete virtual bridge artifacts when cleaning hosts After cleaning hosts by using tools/cleanup_host, some of the ovs bridge devices such as ovs-system still exist. This will result in {{neutron_external_interface}} not working properly because it had been added to the ovs-system bridge. The solution is calling neutron-ovs-cleanup script in neutron_openvswitch_agent container before removing it. TrivialFix Change-Id: Ib3b096d842f2210b8bd223892a3492ef2fcf7c52 Signed-off-by: luyao --- tools/cleanup-containers | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/cleanup-containers b/tools/cleanup-containers index 14249c9605..7396213363 100755 --- a/tools/cleanup-containers +++ b/tools/cleanup-containers @@ -16,6 +16,11 @@ 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