x/vmware-nsx
Code Issues Proposed changes

Update octavia-lib requirements

Browse Source 
To match what the Octavia project is using, and not to pull it from git
automatically

Change-Id: Id26d92822896f698095b77c156ed62fcbdf2a76d
This commit is contained in:
Adit Sarfaty 2019-08-12 15:18:24 +03:00
parent 25e1f60b6e
commit 07409838f0
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devstack/lib/nsx_common
View File

@ -31,7 +31,7 @@ function _nsxv_ini_set {
function install_neutron_projects { function install_neutron_projects {
pkg_list="networking-l2gw networking-sfc neutron-fwaas neutron-dynamic-routing neutron-vpnaas octavia octavia-lib vmware-nsxlib" pkg_list="networking-l2gw networking-sfc neutron-fwaas neutron-dynamic-routing neutron-vpnaas vmware-nsxlib"
for pkg in `echo $pkg_list` for pkg in `echo $pkg_list`
do do
pkg_renamed=`echo $pkg | sed 's/-/_/g'` pkg_renamed=`echo $pkg | sed 's/-/_/g'`
@ -47,6 +47,7 @@ function install_neutron_projects {
sudo chown -R ${USER}:${USER} src/${pkg} sudo chown -R ${USER}:${USER} src/${pkg}
fi fi
done done
# install neutron and octavia separately to not delete neutron-lib & octavia-lib
sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron
sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron.egg* sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron.egg*
sudo rm -rf /usr/local/lib/python3.5/dist-packages/neutron sudo rm -rf /usr/local/lib/python3.5/dist-packages/neutron
@ -57,6 +58,17 @@ function install_neutron_projects {
sudo -H pip install -e "git+https://opendev.org/openstack/neutron@${NEUTRON_BRANCH}#egg=neutron" sudo -H pip install -e "git+https://opendev.org/openstack/neutron@${NEUTRON_BRANCH}#egg=neutron"
sudo chown -R ${USER}:${USER} src/neutron sudo chown -R ${USER}:${USER} src/neutron
fi fi
sudo rm -rf /usr/local/lib/python2.7/dist-packages/octavia
sudo rm -rf /usr/local/lib/python2.7/dist-packages/octavia.egg*
sudo rm -rf /usr/local/lib/python3.5/dist-packages/octavia
sudo rm -rf /usr/local/lib/python3.5/dist-packages/octavia.egg*
if is_service_enabled octavia; then
echo "service octavia is enabled explicitly by devstack"
else
sudo -H pip install -e "git+https://opendev.org/openstack/octavia@${NEUTRON_BRANCH}#egg=octavia"
sudo chown -R ${USER}:${USER} src/octavia
fi
} }
function nsxv_configure_service { function nsxv_configure_service {

4
lower-constraints.txt
View File

@ -10,7 +10,7 @@ httplib2==0.9.1
mock==2.0.0 mock==2.0.0
netaddr==0.7.18 netaddr==0.7.18
neutron-lib==1.28.0 neutron-lib==1.28.0
octavia-lib==1.1.1 octavia-lib==1.3.1
openstackdocstheme==1.18.1 openstackdocstheme==1.18.1
oslo.concurrency==3.26.0 oslo.concurrency==3.26.0
oslo.config==5.2.0 oslo.config==5.2.0
@ -38,7 +38,7 @@ SQLAlchemy==1.2.0
sphinx==1.6.5 sphinx==1.6.5
stestr==1.0.0 stestr==1.0.0
stevedore==1.20.0 stevedore==1.20.0
tenacity==5.0.1 tenacity==5.0.2
testtools==2.2.0 testtools==2.2.0
tooz==1.58.0 tooz==1.58.0
vmware-nsxlib==13.1.0 vmware-nsxlib==13.1.0

4
requirements.txt
View File

@ -7,13 +7,13 @@ eventlet>=0.24.1 # MIT
httplib2>=0.9.1 # MIT httplib2>=0.9.1 # MIT
requests>=2.14.2 # Apache-2.0 requests>=2.14.2 # Apache-2.0
netaddr>=0.7.18 # BSD netaddr>=0.7.18 # BSD
tenacity>=5.0.1 # Apache-2.0 tenacity>=5.0.2 # Apache-2.0
SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.2.0 # MIT SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.2.0 # MIT
six>=1.11.0 # MIT six>=1.11.0 # MIT
stevedore>=1.20.0 # Apache-2.0 stevedore>=1.20.0 # Apache-2.0
neutron-lib>=1.28.0 # Apache-2.0 neutron-lib>=1.28.0 # Apache-2.0
osc-lib>=1.10.0 # Apache-2.0 osc-lib>=1.10.0 # Apache-2.0
octavia-lib>=1.1.1 # Apache-2.0 octavia-lib>=1.3.1 # Apache-2.0
python-openstackclient>=3.16.0 # Apache-2.0 python-openstackclient>=3.16.0 # Apache-2.0
oslo.concurrency>=3.26.0 # Apache-2.0 oslo.concurrency>=3.26.0 # Apache-2.0
oslo.context>=2.19.2 # Apache-2.0 oslo.context>=2.19.2 # Apache-2.0