[OVN] DevStack: Split the OVN_BRANCH and OVS_BRANCH variables
We will soon have different version for OVN and OVS, this patch is splitting the OVN_BRANCH and OVS_BRANCH variables in the DevStack module. Change-Id: Icf32d168d177268afeb02c95084543d97f4f07e6 Signed-off-by: Lucas Alvares Gomes <lucasagomes@gmail.com>
This commit is contained in:
parent
f97ae3d6f8
commit
18c63a7148
|
@ -34,7 +34,7 @@ OVN_BRANCH=${OVN_BRANCH:-master}
|
||||||
# Set variables for building OVS from source
|
# Set variables for building OVS from source
|
||||||
OVS_REPO=${OVS_REPO:-https://github.com/openvswitch/ovs.git}
|
OVS_REPO=${OVS_REPO:-https://github.com/openvswitch/ovs.git}
|
||||||
OVS_REPO_NAME=$(basename ${OVS_REPO} | cut -f1 -d'.')
|
OVS_REPO_NAME=$(basename ${OVS_REPO} | cut -f1 -d'.')
|
||||||
OVS_BRANCH=$OVN_BRANCH
|
OVS_BRANCH=${OVS_BRANCH:-master}
|
||||||
|
|
||||||
# How to connect to ovsdb-server hosting the OVN SB database.
|
# How to connect to ovsdb-server hosting the OVN SB database.
|
||||||
OVN_SB_REMOTE=${OVN_SB_REMOTE:-tcp:$SERVICE_HOST:6642}
|
OVN_SB_REMOTE=${OVN_SB_REMOTE:-tcp:$SERVICE_HOST:6642}
|
||||||
|
|
|
@ -286,6 +286,7 @@
|
||||||
vars:
|
vars:
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
OVN_BRANCH: branch-2.12
|
OVN_BRANCH: branch-2.12
|
||||||
|
OVS_BRANCH: branch-2.12
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: neutron-ovn-tempest-ovs-release
|
name: neutron-ovn-tempest-ovs-release
|
||||||
|
@ -294,6 +295,7 @@
|
||||||
vars:
|
vars:
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
OVN_BRANCH: branch-2.12
|
OVN_BRANCH: branch-2.12
|
||||||
|
OVS_BRANCH: branch-2.12
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: neutron-ovn-tempest-ovs-master-fedora
|
name: neutron-ovn-tempest-ovs-master-fedora
|
||||||
|
|
Loading…
Reference in New Issue