openstack/kolla
Code Issues Proposed changes

Merge "neutron: Use update-alternatives --display instead of --query"

Browse Source
This commit is contained in:
Zuul 2021-11-01 12:49:23 +00:00 committed by Gerrit Code Review
commit 5e40e0894f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/neutron/neutron-base/extend_start.sh
View File

@ -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`.

5
releasenotes/notes/bug-1936947-8beac926823cdf8f.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixes wrong update-alternatives usage on CentOS.
`LP#1936947 <https://launchpad.net/bugs/1936947>`__