Fix to use 10-weave.conflist instead of 10-weave.conf as CNI config file.

Also adds support for portmap as additional plugin along with weave-net

Fixes #3016
This commit is contained in:
Murali Reddy committed 2018-08-31 16:11:24 +05:30
1 parent ad4e4238a5
commit 90907a7647
4 files changed
+28 -10

No files matched your search

+1 -1
View File
@@ -329,7 +329,7 @@ start_suite() {
[ -z "$DEBUG" ] || echo "Cleaning up on $host: removing all containers and resetting weave"
rm_containers $host $(docker_on $host ps -aq 2>/dev/null)
weave_on $host reset 2>/dev/null
run_on $host sudo rm -f /opt/cni/bin/weave-plugin-latest /opt/cni/bin/weave-net /opt/cni/bin/weave-ipam /etc/cni/net.d/10-weave.conf
run_on $host sudo rm -f /opt/cni/bin/weave-plugin-latest /opt/cni/bin/weave-net /opt/cni/bin/weave-ipam /etc/cni/net.d/10-weave.conflist
done
whitely echo "$@"
}