openstack/octavia
Code Issues Proposed changes

Revert pyroute2 workaround

Browse Source 
The pyroute2 module had a regression in 0.5.13, but neutron needed a fix
that was included in 0.5.13. It was easier for us to work around it than
for neutron to revert the update to 0.5.13, so we hacked a workaround[1].

A new pyroute2 release, 0.5.14, has been published, so this patch reverts
the hack and bumps our minimum version of pyroute2 to 0.5.14.

[1] https://review.opendev.org/#/c/744045

Change-Id: Ia4357a4f5db07e1a6b0beb11b58ce125215eeef1
This commit is contained in:
Michael Johnson
2020-09-10 16:54:08 -07:00
parent f306ec7f46
commit a446c04f77
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
elements/amphora-agent/install.d/amphora-agent-source-install/75-amphora-agent-install
View File

@@ -19,12 +19,6 @@ $AMP_VENV/bin/pip install -U -c /opt/upper-constraints.txt /opt/amphora-agent
# Let's capture the git reference we installed in the venv # Let's capture the git reference we installed in the venv
git --git-dir=/opt/amphora-agent/.git rev-parse HEAD >> /opt/amphora-agent.gitref git --git-dir=/opt/amphora-agent/.git rev-parse HEAD >> /opt/amphora-agent.gitref
# Workaround https://github.com/svinota/pyroute2/issues/724
# TODO(johnsom) Remove once a that is resolved and 0.5.13 has been blocked in
# global requirements.
$AMP_VENV/bin/pip uninstall -y pyroute2
$AMP_VENV/bin/pip install pyroute2==0.5.12
# Link the amphora-agent out to /usr/local/bin where the startup scripts look # Link the amphora-agent out to /usr/local/bin where the startup scripts look
ln -s $AMP_VENV/bin/amphora-agent /usr/local/bin/amphora-agent || true ln -s $AMP_VENV/bin/amphora-agent /usr/local/bin/amphora-agent || true

2
lower-constraints.txt
View File

@@ -118,7 +118,7 @@ PyNaCl==1.2.1
pyOpenSSL==19.1.0 pyOpenSSL==19.1.0
pyparsing==2.2.0 pyparsing==2.2.0
pyperclip==1.6.0 pyperclip==1.6.0
pyroute2==0.5.13 pyroute2==0.5.14
python-barbicanclient==4.5.2 python-barbicanclient==4.5.2
python-dateutil==2.7.0 python-dateutil==2.7.0
python-editor==1.0.3 python-editor==1.0.3

2
requirements.txt
View File

@@ -52,6 +52,6 @@ setproctitle>=1.1.10 # BSD
Flask!=0.11,>=0.10 # BSD Flask!=0.11,>=0.10 # BSD
netifaces>=0.10.4 # MIT netifaces>=0.10.4 # MIT
cryptography>=3.0 # BSD/Apache-2.0 cryptography>=3.0 # BSD/Apache-2.0
pyroute2>=0.5.13;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2) pyroute2>=0.5.14;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2)
gunicorn>=19.9.0 # MIT gunicorn>=19.9.0 # MIT
Werkzeug>=0.14.1 # BSD License Werkzeug>=0.14.1 # BSD License