fix ovn dhcp not work with ovs-dpdk (#1853)

* fix ovn dhcp for ovs-dpdk. Co-authored-by: wanglong <wang.long@99cloud.net> (cherry picked from commit 2a2a32f)
kubeovn · Aug 25, 2022 · e3b4102 · e3b4102
1 parent 237e318
commit e3b4102
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/dist/images/Dockerfile.base-dpdk b/dist/images/Dockerfile.base-dpdk
@@ -30,6 +30,7 @@ RUN cd /usr/src/ && \
     cd ovs && \
     git checkout c50a0f080d95e9027b7ba3a70150b02c2377c721 && \
     curl -s https://github.com/kubeovn/ovs/commit/22ea22c40b46ee5adeae977ff6cfca81b3ff25d7.patch | git apply && \
+    curl -s https://github.com/openvswitch/ovs/commit/a432b1eb496cc1606873068c26716977a02029e2.patch | git apply && \
     # compile without avx512
     if [ "$ARCH" = "amd64" -a "$NO_AVX512" = "true" ]; then curl -s https://github.com/kubeovn/ovs/commit/38c59e078d69b343f56ab0f380fb9f42b94b7c02.patch | git apply; fi && \
     ./boot.sh && \

diff --git a/dist/images/start-ovs-dpdk-v2.sh b/dist/images/start-ovs-dpdk-v2.sh
@@ -16,7 +16,7 @@ modprobe vfio-pci
 
 
 # band nic to dpdk driver
-driverctl set-override ${DPDK_DEV}  modprobe vfio-pci
+driverctl set-override ${DPDK_DEV} vfio-pci
 
 # link sock
 mkdir -p /usr/local/var/run
@@ -103,4 +103,4 @@ ovs-vsctl set open . external-ids:ovn-remote-probe-interval=10000
 ovs-vsctl set open . external-ids:ovn-openflow-probe-interval=180
 ovs-vsctl set open . external-ids:ovn-encap-type=geneve
 
-tail -f /var/log/openvswitch/ovs-vswitchd.log
+tail -f /var/log/openvswitch/ovs-vswitchd.log