x
/
vmware-nsx
Code Issues Proposed changes

Stop getting upstream master neutron-fwaas 

As neutron-fwaas is no longer maintained, get it from pypi instead of Git.
Also update neutron projects in requirements to latested released versions

Change-Id: I866d0b6f57f7b34ccc8bc998b8df729103497f6c
This commit is contained in:
asarfaty 2020-06-21 09:41:33 +02:00
parent d8aa8db80c
commit 1c9e123b80
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/nsx_common
View File

@ -31,7 +31,7 @@ function _nsxv_ini_set {
function install_neutron_projects {
pkg_list="networking-l2gw networking-sfc neutron-fwaas neutron-dynamic-routing neutron-vpnaas vmware-nsxlib"
pkg_list="networking-l2gw networking-sfc neutron-dynamic-routing neutron-vpnaas vmware-nsxlib"
for pkg in `echo $pkg_list`
do
pkg_renamed=`echo $pkg | sed 's/-/_/g'`

1
lower-constraints.txt
View File

@ -11,6 +11,7 @@ httplib2==0.9.1
kombu==4.0.0
netaddr==0.7.18
neutron-lib==2.0.0
neutron-fwaas==16.0.0
octavia-lib==1.3.1
openstackdocstheme==1.18.1
oslo.concurrency==3.26.0

14
requirements.txt
View File

@ -32,15 +32,15 @@ decorator>=4.4.1 # BSD
# These repos are installed from git in OpenStack CI if the job
# configures them as required-projects:
neutron>=15.0.0.0 # Apache-2.0
networking-l2gw>=15.0.0 # Apache-2.0
neutron>=16.0.0.0 # Apache-2.0
networking-l2gw>=16.0.0 # Apache-2.0
networking-sfc>=9.0.0.0 # Apache-2.0
neutron-fwaas>=15.0.0.0 # Apache-2.0
neutron-vpnaas>=15.0.0.0 # Apache-2.0
neutron-dynamic-routing>=15.0.0.0 # Apache-2.0
vmware-nsxlib>=15.0.1 # Apache-2.0
neutron-fwaas>=16.0.0.0 # Apache-2.0
neutron-vpnaas>=16.0.0.0 # Apache-2.0
neutron-dynamic-routing>=16.0.0.0 # Apache-2.0
vmware-nsxlib>=16.0.0 # Apache-2.0
# NOTE: we require octavia but can't depend on it for Stein
# octavia>=5.0.0.0 # Apache-2.0
# octavia>=6.0.0.0 # Apache-2.0
# The comment below indicates this project repo is current with neutron-lib
# and should receive neutron-lib consumption patches as they are released

1
tox.ini
View File

@ -31,7 +31,6 @@ commands = false
commands =
pip install -q -e "git+https://opendev.org/openstack/networking-l2gw#egg=networking_l2gw"
pip install -q -e "git+https://opendev.org/openstack/networking-sfc#egg=networking_sfc"
pip install -q -e "git+https://opendev.org/openstack/neutron-fwaas#egg=neutron_fwaas"
pip install -q -e "git+https://opendev.org/openstack/neutron-dynamic-routing#egg=neutron_dynamic_routing"
pip install -q -e "git+https://opendev.org/openstack/neutron-vpnaas#egg=neutron_vpnaas"
pip install -q -e "git+https://opendev.org/openstack/octavia#egg=octavia"