feat: update to 20.03.0 ovn

kubeovn · Feb 17, 2020 · 2bcf0d2 · 2bcf0d2
1 parent 7f78245
commit 2bcf0d2
Show file tree

Hide file tree

Showing 18 changed files with 189 additions and 125 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v1.0.0
+v1.1.0-pre
diff --git a/dist/images/Dockerfile.cni b/dist/images/Dockerfile.cni
@@ -10,19 +10,22 @@ RUN yum install -y  \
         libpcap \
         hostname \
         iproute strace socat nc \
-        unbound unbound-devel&& \
-        yum clean all
+        unbound unbound-devel \
+        tcpdump ipset \
+        epel-release https://centos7.iuscommunity.org/ius-release.rpm
 
-ENV OVS_VERSION=2.12.0
-ENV OVS_SUBVERSION=5
+RUN yum install python34 -y && ln -s /bin/python3.4 /bin/python3 && yum clean all
 
-RUN rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm
+ENV OVS_VERSION=20.03.0
+ENV OVS_SUBVERSION=1
 
+RUN rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm
 
-RUN yum install -y tcpdump ipset && \
-        yum clean all
+RUN mkdir -p /var/run/openvswitch
 
 ENV CNI_VERSION=v0.7.5
 RUN curl -sSf -L --retry 5 https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-amd64-${CNI_VERSION}.tgz | tar -xz -C . ./loopback ./portmap

diff --git a/dist/images/Dockerfile.controller b/dist/images/Dockerfile.controller
@@ -10,18 +10,20 @@ RUN yum install -y  \
         libpcap \
         hostname \
         iproute strace socat nc \
-        unbound unbound-devel&& \
-        yum clean all
-
-ENV OVS_VERSION=2.12.0
-ENV OVS_SUBVERSION=5
-
-RUN rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-vtep-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm
+        unbound unbound-devel \
+        tcpdump ipset \
+        epel-release https://centos7.iuscommunity.org/ius-release.rpm
+
+RUN yum install python34 -y && ln -s /bin/python3.4 /bin/python3 && yum clean all
+
+ENV OVS_VERSION=20.03.0
+ENV OVS_SUBVERSION=1
+
+RUN rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm
 
 RUN mkdir -p /var/run/openvswitch
 WORKDIR /kube-ovn

diff --git a/dist/images/Dockerfile.db b/dist/images/Dockerfile.db
@@ -10,18 +10,20 @@ RUN yum install -y  \
         libpcap \
         hostname \
         iproute strace socat nc \
-        unbound unbound-devel && \
-        yum clean all
-
-ENV OVS_VERSION=2.12.0
-ENV OVS_SUBVERSION=5
-
-RUN rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-vtep-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm
+        unbound unbound-devel \
+        tcpdump ipset \
+        epel-release https://centos7.iuscommunity.org/ius-release.rpm
+
+RUN yum install python34 -y && ln -s /bin/python3.4 /bin/python3 && yum clean all
+
+ENV OVS_VERSION=20.03.0
+ENV OVS_SUBVERSION=1
+
+RUN rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm
 
 RUN mkdir -p /var/run/openvswitch
 

diff --git a/dist/images/Dockerfile.node b/dist/images/Dockerfile.node
@@ -10,18 +10,22 @@ RUN yum install -y  \
         libpcap \
         hostname \
         iproute strace socat nc \
-        unbound unbound-devel && \
-        yum clean all
-
-ENV OVS_VERSION=2.12.0
-ENV OVS_SUBVERSION=5
-
-RUN rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-vtep-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm
+        unbound unbound-devel \
+        tcpdump ipset \
+        epel-release https://centos7.iuscommunity.org/ius-release.rpm
+
+RUN yum install python34 -y && ln -s /bin/python3.4 /bin/python3 && yum clean all
+
+ENV OVS_VERSION=20.03.0
+ENV OVS_SUBVERSION=1
+
+RUN rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm
+
+RUN mkdir -p /var/run/openvswitch
 
 RUN mkdir -p /var/run/openvswitch && \
     mkdir -p /etc/cni/net.d && \

diff --git a/dist/images/Dockerfile.pinger b/dist/images/Dockerfile.pinger
@@ -10,18 +10,20 @@ RUN yum install -y  \
         libpcap \
         hostname \
         iproute strace socat nc \
-        unbound unbound-devel && \
-        yum clean all
-
-ENV OVS_VERSION=2.12.0
-ENV OVS_SUBVERSION=5
-
-RUN rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-vtep-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm
+        unbound unbound-devel \
+        tcpdump ipset \
+        epel-release https://centos7.iuscommunity.org/ius-release.rpm
+
+RUN yum install python34 -y && ln -s /bin/python3.4 /bin/python3 && yum clean all
+
+ENV OVS_VERSION=20.03.0
+ENV OVS_SUBVERSION=1
+
+RUN rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm
 
 RUN mkdir -p /var/run/openvswitch
 WORKDIR /kube-ovn

diff --git a/dist/images/Dockerfile.webhook b/dist/images/Dockerfile.webhook
@@ -10,18 +10,20 @@ RUN yum install -y  \
         libpcap \
         hostname \
         iproute strace socat nc \
-        unbound unbound-devel && \
-        yum clean all
-
-ENV OVS_VERSION=2.12.0
-ENV OVS_SUBVERSION=5
-
-RUN rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-vtep-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
-    rpm -ivh https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm
+        unbound unbound-devel \
+        tcpdump ipset \
+        epel-release https://centos7.iuscommunity.org/ius-release.rpm
+
+RUN yum install python34 -y && ln -s /bin/python3.4 /bin/python3 && yum clean all
+
+ENV OVS_VERSION=20.03.0
+ENV OVS_SUBVERSION=1
+
+RUN rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/openvswitch-devel-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-central-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm && \
+    rpm -ivh --nodeps https://github.com/alauda/ovs/releases/download/${OVS_VERSION}-${OVS_SUBVERSION}/ovn-host-${OVS_VERSION}-${OVS_SUBVERSION}.el7.x86_64.rpm
 
 RUN mkdir -p /var/run/openvswitch
 WORKDIR /kube-ovn

diff --git a/dist/images/kubectl-ko b/dist/images/kubectl-ko
@@ -139,7 +139,7 @@ diagnose(){
         nodeName=$(kubectl get pod "$pinger" -n "$KUBE_OVN_NS" -o jsonpath={.spec.nodeName})
         echo "### start to diagnose node $nodeName"
         echo "#### ovn-controller log:"
-        kubectl exec -n $KUBE_OVN_NS -it "$pinger" -- tail /var/log/openvswitch/ovn-controller.log
+        kubectl exec -n $KUBE_OVN_NS -it "$pinger" -- tail /var/log/ovn/ovn-controller.log
         echo ""
         kubectl exec -n $KUBE_OVN_NS -it "$pinger" -- /kube-ovn/kube-ovn-pinger --mode=job
         echo "### finish diagnose node $nodeName"
@@ -152,7 +152,7 @@ diagnose(){
       pinger=$(kubectl get pod -n $KUBE_OVN_NS -o wide | grep kube-ovn-pinger | grep " $nodeName " | awk '{print $1}')
       echo "### start to diagnose node nodeName"
       echo "#### ovn-controller log:"
-      kubectl exec -n $KUBE_OVN_NS -it "$pinger" -- tail /var/log/openvswitch/ovn-controller.log
+      kubectl exec -n $KUBE_OVN_NS -it "$pinger" -- tail /var/log/ovn/ovn-controller.log
       echo ""
       kubectl exec -n $KUBE_OVN_NS -it "$pinger" -- /kube-ovn/kube-ovn-pinger --mode=job
       echo "### finish diagnose node nodeName"

diff --git a/dist/images/ovn-healthcheck.sh b/dist/images/ovn-healthcheck.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -euo pipefail
 
-alias ovn-ctl='/usr/share/openvswitch/scripts/ovn-ctl'
+alias ovn-ctl='/usr/share/ovn/scripts/ovn-ctl'
 
 ovn-ctl status_northd
 ovn-ctl status_ovnnb

diff --git a/dist/images/ovn-is-leader.sh b/dist/images/ovn-is-leader.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -euo pipefail
 
-alias ovn-ctl='/usr/share/openvswitch/scripts/ovn-ctl'
+alias ovn-ctl='/usr/share/ovn/scripts/ovn-ctl'
 
 ovn-ctl status_northd
 ovn-ctl status_ovnnb

diff --git a/dist/images/ovs-healthcheck.sh b/dist/images/ovs-healthcheck.sh
@@ -2,8 +2,7 @@
 set -euo pipefail
 
 alias ovs-ctl='/usr/share/openvswitch/scripts/ovs-ctl'
-alias ovn-ctl='/usr/share/openvswitch/scripts/ovn-ctl'
+alias ovn-ctl='/usr/share/ovn/scripts/ovn-ctl'
 
 ovs-ctl status
 ovn-ctl status_controller
-ovn-ctl status_controller_vtep
diff --git a/dist/images/start-db.sh b/dist/images/start-db.sh
@@ -36,25 +36,25 @@ function get_leader_ip {
 }
 
 function quit {
-    /usr/share/openvswitch/scripts/ovn-ctl stop_northd
+    /usr/share/ovn/scripts/ovn-ctl stop_northd
     exit 0
 }
 trap quit EXIT
 
 if [[ -z "$NODE_IPS" ]]; then
-    /usr/share/openvswitch/scripts/ovn-ctl restart_northd
+    /usr/share/ovn/scripts/ovn-ctl restart_northd
     ovn-nbctl set-connection ptcp:"${DB_NB_PORT}":["${DB_NB_ADDR}"]
     ovn-nbctl set Connection . inactivity_probe=0
     ovn-sbctl set-connection ptcp:"${DB_SB_PORT}":["${DB_SB_ADDR}"]
     ovn-sbctl set Connection . inactivity_probe=0
 else
-    /usr/share/openvswitch/scripts/ovn-ctl stop_northd
+    /usr/share/ovn/scripts/ovn-ctl stop_northd
 
     nb_leader_ip=$(get_leader_ip nb)
     sb_leader_ip=$(get_leader_ip sb)
     if [[ "$nb_leader_ip" == "${POD_IP}" ]]; then
         # Start ovn-northd, ovn-nb and ovn-sb
-        /usr/share/openvswitch/scripts/ovn-ctl \
+        /usr/share/ovn/scripts/ovn-ctl \
             --db-nb-create-insecure-remote=yes \
             --db-sb-create-insecure-remote=yes \
             --db-nb-cluster-local-addr="${POD_IP}" \
@@ -75,7 +75,7 @@ else
         done
 
         # Start ovn-northd, ovn-nb and ovn-sb
-        /usr/share/openvswitch/scripts/ovn-ctl \
+        /usr/share/ovn/scripts/ovn-ctl \
             --db-nb-create-insecure-remote=yes \
             --db-sb-create-insecure-remote=yes \
             --db-nb-cluster-local-addr="${POD_IP}" \
@@ -88,4 +88,4 @@ else
     fi
 fi
 
-tail -f /var/log/openvswitch/ovn-northd.log
+tail -f /var/log/ovn/ovn-northd.log
diff --git a/dist/images/start-ovs.sh b/dist/images/start-ovs.sh
@@ -29,7 +29,6 @@ wait_ovn_sb
 function quit {
 	/usr/share/openvswitch/scripts/ovs-ctl stop
 	/usr/share/openvswitch/scripts/ovn-ctl stop_controller
-	/usr/share/openvswitch/scripts/ovn-ctl stop_controller_vtep
 	exit 0
 }
 trap quit EXIT
@@ -50,13 +49,12 @@ fi
 /usr/share/openvswitch/scripts/ovs-ctl --protocol=udp --dport=6081 enable-protocol
 
 # Start ovn-controller
-/usr/share/openvswitch/scripts/ovn-ctl restart_controller
-/usr/share/openvswitch/scripts/ovn-ctl restart_controller_vtep
+/usr/share/ovn/scripts/ovn-ctl restart_controller
 
 # Set remote ovn-sb for ovn-controller to connect to
 ovs-vsctl set open . external-ids:ovn-remote=tcp:"${OVN_SB_SERVICE_HOST}":"${OVN_SB_SERVICE_PORT}"
 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/ovn/ovn-controller.log
diff --git a/pkg/pinger/ovn.go b/pkg/pinger/ovn.go
@@ -22,7 +22,7 @@ func checkOvs(config *Configuration) {
 }
 
 func checkOvnController(config *Configuration) {
-	output, err := exec.Command("/usr/share/openvswitch/scripts/ovn-ctl", "status_controller").CombinedOutput()
+	output, err := exec.Command("/usr/share/ovn/scripts/ovn-ctl", "status_controller").CombinedOutput()
 	if err != nil {
 		klog.Errorf("check ovn_controller status failed %v, %q", err, output)
 		SetOvnControllerDownMetrics(config.NodeName)