OVN git repository default branch is called "main"

The OVN git repository default branch is called "main", not
"master": https://github.com/ovn-org/ovn/branches

Closes-Bug: #1946445
Change-Id: I02c919f9a598690b57f27172fdeaee883db6310b

devstack/devstackgaterc

@@ -33,8 +33,8 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"PHYSICAL_NETWORK=public"
 if [[ "${OVN_OPTS}" == *"latest-release"* ]] ; then
     export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVN_BRANCH=v20.03.0"
     export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVS_BRANCH=v2.13.0"
-elif [[ "${OVN_OPTS}" == *"master"* ]] ; then
-    export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVN_BRANCH=master"
+elif [[ "${OVN_OPTS}" == *"main"* ]] ; then
+    export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVN_BRANCH=main"
 else
     echo "No ovs branch specified, using the default from the devstack plugin"
 fi

devstack/lib/ovn

@@ -16,7 +16,7 @@
 # Set variables for building OVN from source
 OVN_REPO=${OVN_REPO:-https://github.com/ovn-org/ovn.git}
 OVN_REPO_NAME=$(basename ${OVN_REPO} | cut -f1 -d'.')
-OVN_BRANCH=${OVN_BRANCH:-master}
+OVN_BRANCH=${OVN_BRANCH:-main}
 
 # Set variables for building OVS from source
 OVS_REPO=${OVS_REPO:-https://github.com/openvswitch/ovs.git}
@@ -25,9 +25,9 @@ OVS_BRANCH=${OVS_BRANCH:-master}
 
 
 function use_new_ovn_repository {
-    # IF OVN_BRANCH is "master" or branch-2.13 (or higher), use the new
+    # IF OVN_BRANCH is "main" or branch-2.13 (or higher), use the new
     # OVN repository
-    [ "$OVN_BRANCH" == "master" ] && return 0
+    [ "$OVN_BRANCH" == "main" ] && return 0
     return $(! printf "%s\n%s" ${OVN_BRANCH//[!0-9.]/} 2.12 | sort -C -V)
 }
 

zuul.d/networking-ovn-jobs.yaml

@@ -319,7 +319,7 @@
         Q_USE_PROVIDERNET_FOR_PUBLIC: true
         ENABLE_CHASSIS_AS_GW: true
         OVN_L3_CREATE_PUBLIC_NETWORK: true
-        OVN_BRANCH: master
+        OVN_BRANCH: main
         OVS_BRANCH: master
       devstack_local_conf:
         post-config: