From 2b8607df937482d1881f264f85567d6e770dca47 Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Tue, 29 Aug 2017 13:32:55 -0700 Subject: work around local-host ip route issue in ovsdpdk cni Change-Id: Ia25fb3165aca40ee9b510a5133212b7867c4ef0b Signed-off-by: Guo Ruijing --- src/cni/ovsdpdk/kube_cniovsdpdk.yml | 5 ++++- src/cni/ovsdpdk/setup_ovsdpdk.sh | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src/cni/ovsdpdk') diff --git a/src/cni/ovsdpdk/kube_cniovsdpdk.yml b/src/cni/ovsdpdk/kube_cniovsdpdk.yml index 8e8ed0e..1699f61 100644 --- a/src/cni/ovsdpdk/kube_cniovsdpdk.yml +++ b/src/cni/ovsdpdk/kube_cniovsdpdk.yml @@ -21,7 +21,10 @@ data: "bridge": "br-dpdk", "ipam": { "type": "host-local", - "subnet": "10.244.0.0/16" + "subnet": "10.244.0.0/16", + "rangeStart": "10.244.0.100", + "gateway": "10.244.0.1", + "dataDir": "/vagrant/container-ipam-state" } } --- diff --git a/src/cni/ovsdpdk/setup_ovsdpdk.sh b/src/cni/ovsdpdk/setup_ovsdpdk.sh index a1813c9..6009b7a 100755 --- a/src/cni/ovsdpdk/setup_ovsdpdk.sh +++ b/src/cni/ovsdpdk/setup_ovsdpdk.sh @@ -7,8 +7,10 @@ pid=$(echo $netns | cut -f3 -d"/") sudo ovs-vsctl --may-exist add-br br-dpdk -- set bridge br-dpdk datapath_type=netdev sudo ovs-vsctl --may-exist add-port br-dpdk vhost-user-$pid -- set Interface vhost-user-$pid type=dpdkvhostuser + sudo ln -sf $netns /var/run/netns/$pid sudo ip link add dummy-$pid type dummy sudo ip link set dummy-$pid netns $pid + sudo mkdir -p /var/run/cni echo $ip | sudo tee /var/run/cni/netconf-$pid -- cgit 1.2.3-korg