diff options
| author | luyao <lu.yao135@zte.com.cn> | 2016-08-23 10:55:52 +0800 |
|---|---|---|
| committer | Yao Lu <lu.yao135@zte.com.cn> | 2016-09-06 09:05:30 +0000 |
| commit | cf2ff03d60f1282c920bb5dd4edec37fa6216ced (patch) | |
| tree | 0616ce8cb5c9bb5707d5d4f262b36464c7d8a49e /tools | |
| parent | 755d5172b325fbfebb80df64a63d6faf653c3390 (diff) | |
| download | kolla-cf2ff03d60f1282c920bb5dd4edec37fa6216ced.tar.gz kolla-cf2ff03d60f1282c920bb5dd4edec37fa6216ced.zip | |
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 <lu.yao135@zte.com.cn>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/cleanup-containers | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/cleanup-containers b/tools/cleanup-containers index 14249c960..739621336 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 |