Skip to content

Commit 22ce464

Browse files
mnasiadkasagarun
authored andcommitted
neutron: Use update-alternatives --display instead of --query
--query is not supported before update-alternatives 1.15 and CentOS uses 1.13 Closes-Bug: #1936947 Change-Id: I78da7eb2b6b5eae2b04fd95b24615bd4a572a1d6 (cherry picked from commit 2d1bbe7)
1 parent 51d5e44 commit 22ce464

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

docker/neutron/neutron-base/extend_start.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ else
1313
fi
1414

1515
# set legacy iptables to allow kernels not supporting iptables-nft
16-
if $UPDATE_ALTERNATIVES --query iptables; then
16+
# CentOS has update-alternatives 1.13, so use --display (not --query)
17+
if $UPDATE_ALTERNATIVES --display iptables; then
1718
# NOTE(yoctozepto): Kolla-Ansible does not always set KOLLA_LEGACY_IPTABLES;
1819
# the workaround below ensures it gets set to `false` in such cases to fix
1920
# this code under `set -o nounset`.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes wrong update-alternatives usage on CentOS.
5+
`LP#1936947 <https://launchpad.net/bugs/1936947>`__

0 commit comments

Comments
 (0)