Skip to content

Synchronise victoria with upstream #148

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

Merged
merged 1 commit into from
Jul 25, 2022
Merged

Synchronise victoria with upstream #148

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion docker/neutron/neutron-base/extend_start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ else
fi

# set legacy iptables to allow kernels not supporting iptables-nft
if $UPDATE_ALTERNATIVES --query iptables; then
# CentOS has update-alternatives 1.13, so use --display (not --query)
if $UPDATE_ALTERNATIVES --display iptables; then
# NOTE(yoctozepto): Kolla-Ansible does not always set KOLLA_LEGACY_IPTABLES;
# the workaround below ensures it gets set to `false` in such cases to fix
# this code under `set -o nounset`.
Expand Down
5 changes: 5 additions & 0 deletions releasenotes/notes/bug-1936947-8beac926823cdf8f.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
fixes:
- |
Fixes wrong update-alternatives usage on CentOS.
`LP#1936947 <https://launchpad.net/bugs/1936947>`__