Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IPsec] Apply a patch to upgrade Python2 code in ovs ovs-monitor-ipsec #1046

Merged
merged 1 commit into from
Aug 12, 2020
Merged

[IPsec] Apply a patch to upgrade Python2 code in ovs ovs-monitor-ipsec #1046

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion build/images/ovs/apply-patches.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,13 @@ curl https://github.com/openvswitch/ovs/commit/3c18bb0fe9f23308061217f72e2245f0e
curl https://github.com/openvswitch/ovs/commit/fe175ac17352ceb2dbc9958112b4b1bc114d82f0.patch | \
git apply

# The OVS ovs-monitor-ipsec script has a Python3 shebang but still includes some Python2-specific code.
# Until the patch which fixes the script is merged upstream, we apply it here, or Antrea IPsec support will be broken.
curl https://github.com/lzhecheng/ovs/commit/869b06356e389079861962160e864df609d033e5.patch | \
git apply

# OVS hardcodes the installation path to /usr/lib/python3.7/dist-packages/ but this location
# does not seem to be in the Python path in Ubuntu 20.04. There may be a better way to do this,
# but this seems like an acceptable workaround.
sed -i 's/python3\.7/python3\.8/' debian/openvswitch-test.install
sed -i 's/python3\.7/python3\.8/' debian/python3-openvswitch.install
sed -i 's/python3\.7/python3\.8/' debian/python3-openvswitch.install