Merge pull request #16311 from dcbw/dind-ovn-fixes

Automatic merge from submit-queue

dind: fix token race, enable GENEVE UDP port, and update OVN repo

@danwinship @stevekuznetsov @rajatchopra

Author: openshift-merge-robot

images/dind/node/Dockerfile

@@ -35,7 +35,7 @@ RUN rm -f /etc/cni/net.d/*
 # with the newer release. (This can go away when the base image is upgraded to
 # OVS 2.8 prerelease or release versions and include OVN sub-packages)
 RUN dnf -y install dnf-plugins-core &&\
- dnf -y copr enable leifmadsen/ovs-master &&\
+ dnf -y copr enable danw/origin-dind-ovs &&\
  dnf -y update openvswitch &&\
  dnf -y install openvswitch-ovn-*
 

images/dind/node/ovn-kubernetes-node.sh

@@ -16,7 +16,7 @@ function is-northd-running() {
 function have-token() {
   local master_dir=$1
 
-  cat ${master_dir}/ovn.token > /dev/null
+  [[ -s "${master_dir}/ovn.token" ]]
 }
 
 function ovn-kubernetes-node() {
@@ -45,6 +45,9 @@ EOF
   apiserver=$(grep server ${kube_config} | cut -f 6 -d' ')
   ovn_master_ip=$(echo -n ${apiserver} | cut -d "/" -f 3 | cut -d ":" -f 1)
 
+  # Ensure GENEVE's UDP port isn't firewalled
+  /usr/share/openvswitch/scripts/ovs-ctl --protocol=udp --dport=6081 enable-protocol
+
   os::util::wait-for-condition "ovn-northd" "is-northd-running ${ovn_master_ip}" "120"
 
   echo "Enabling and start ovn-kubernetes node services"