x
/
vmware-nsx
Code Issues Proposed changes

Fix nsxlib & l2gw version for Victoria branch 

Change-Id: Idca02aedbce2a1538406512abc148857fe62265e
This commit is contained in:
asarfaty 2020-11-02 11:24:52 +02:00
parent ec8df326b9
commit 6afded95ab
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/lib/nsx_common
View File

@ -47,7 +47,7 @@ function install_neutron_projects {
sudo chown -R ${USER}:${USER} src/${pkg}
fi
done
# same for l2wg which is out of stadium (last stable branch is ussuri)
# same for l2wg which is out of stadium
pkg_list="networking-l2gw"
for pkg in `echo $pkg_list`
do
@ -60,7 +60,7 @@ function install_neutron_projects {
elif use_library_from_git $pkg; then
echo "Project $pkg enabled explicitly from LIBS_FROM_GIT"
else
sudo -H ${PIP} install -e "git+https://opendev.org/x/${pkg}@stable/ussuri#egg=${pkg_renamed}"
sudo -H ${PIP} install -e "git+https://opendev.org/x/${pkg}@${NEUTRON_BRANCH}#egg=${pkg_renamed}"
sudo chown -R ${USER}:${USER} src/${pkg}
fi
done

2
lower-constraints.txt
View File

@ -45,4 +45,4 @@ stevedore==1.20.0
tenacity==5.0.2
testtools==2.2.0
tooz==1.58.0
vmware-nsxlib==15.0.1
vmware-nsxlib==17.0.0

4
requirements.txt
View File

@ -33,12 +33,12 @@ decorator>=4.4.1 # BSD
# These repos are installed from git in OpenStack CI if the job
# configures them as required-projects:
neutron>=17.0.0.0 # Apache-2.0
networking-l2gw>=16.0.0 # Apache-2.0
networking-l2gw>=17.0.1 # Apache-2.0
networking-sfc>=10.0.0.0 # Apache-2.0
neutron-fwaas>=16.0.0.0 # Apache-2.0
neutron-vpnaas>=17.0.0.0 # Apache-2.0
neutron-dynamic-routing>=16.0.0.0 # Apache-2.0
vmware-nsxlib>=16.0.0 # Apache-2.0
vmware-nsxlib>=17.0.0 # Apache-2.0
# NOTE: we require octavia but can't depend on it
# octavia>=7.0.0.0 # Apache-2.0

2
tox.ini
View File

@ -29,7 +29,7 @@ commands = false
# https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs
# note that order is important to ensure dependencies don't override
commands =
pip install -q -e "git+https://opendev.org/x/networking-l2gw@stable/ussuri#egg=networking_l2gw"
pip install -q -e "git+https://opendev.org/x/networking-l2gw@stable/victoria#egg=networking_l2gw"
pip install -q -e "git+https://opendev.org/openstack/networking-sfc@stable/victoria#egg=networking_sfc"
pip install -q -e "git+https://opendev.org/openstack/neutron-fwaas@stable/ussuri#egg=neutron_fwaas"
pip install -q -e "git+https://opendev.org/openstack/neutron-dynamic-routing@stable/victoria#egg=neutron_dynamic_routing"