diff options
author | Guo Ruijing <ruijing.guo@intel.com> | 2017-08-29 13:32:55 -0700 |
---|---|---|
committer | Guo Ruijing <ruijing.guo@intel.com> | 2017-08-30 13:11:41 -0700 |
commit | 2b8607df937482d1881f264f85567d6e770dca47 (patch) | |
tree | 72196689b6f41ac524e529d7991c769f93029867 /src/cni | |
parent | 72a7b3b69735d65c4163bde25b361853700c3007 (diff) |
work around local-host ip route issue in ovsdpdk cni
Change-Id: Ia25fb3165aca40ee9b510a5133212b7867c4ef0b
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Diffstat (limited to 'src/cni')
-rw-r--r-- | src/cni/ovsdpdk/kube_cniovsdpdk.yml | 5 | ||||
-rwxr-xr-x | src/cni/ovsdpdk/setup_ovsdpdk.sh | 2 |
2 files changed, 6 insertions, 1 deletions
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 |