summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-05-22 14:10:53 +0000
committerGerrit Code Review <review@openstack.org>2020-05-22 14:10:53 +0000
commit354dcccf2d5a0bea6c9443f27542e8dc090491f1 (patch)
tree08adb26fa7c0bc2ac7ef767bd0d2260dadbfc534 /devstack
parent7b7ced04bb3baaabc9b307b8924cafe6f6ff789a (diff)
parente0e3086b465a91a010b6a21fdd2e70c12f583283 (diff)
downloadneutron-354dcccf2d5a0bea6c9443f27542e8dc090491f1.tar.gz
Merge "Default OVN_BRANCH and OVS_BRANCH to latest stable"
Diffstat (limited to 'devstack')
-rw-r--r--devstack/lib/ovn_agent4
1 files changed, 2 insertions, 2 deletions
diff --git a/devstack/lib/ovn_agent b/devstack/lib/ovn_agent
index 3022a7475b..9c3c4a8fb8 100644
--- a/devstack/lib/ovn_agent
+++ b/devstack/lib/ovn_agent
@@ -30,13 +30,13 @@ source $TOP_DIR/lib/neutron_plugins/openvswitch_agent
OVN_REPO=${OVN_REPO:-https://github.com/ovn-org/ovn.git}
OVN_REPO_NAME=$(basename ${OVN_REPO} | cut -f1 -d'.')
OVN_REPO_NAME=${OVN_REPO_NAME:-ovn}
-OVN_BRANCH=${OVN_BRANCH:-master}
+OVN_BRANCH=${OVN_BRANCH:-v20.03.0}
# Set variables for building OVS from source
OVS_REPO=${OVS_REPO:-https://github.com/openvswitch/ovs.git}
OVS_REPO_NAME=$(basename ${OVS_REPO} | cut -f1 -d'.')
OVS_REPO_NAME=${OVS_REPO_NAME:-ovs}
-OVS_BRANCH=${OVS_BRANCH:-master}
+OVS_BRANCH=${OVS_BRANCH:-v2.13.0}
if is_service_enabled tls-proxy; then
OVN_PROTO=ssl