From 62d7ef9e86f146c99f4fdea6d19827a6375b12e4 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 28 Oct 2021 09:17:17 +0200 Subject: [PATCH] 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 2d1bbe72579f9209e151133352d4d6761f764f33) --- docker/neutron/neutron-base/extend_start.sh | 3 ++- releasenotes/notes/bug-1936947-8beac926823cdf8f.yaml | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/bug-1936947-8beac926823cdf8f.yaml diff --git a/docker/neutron/neutron-base/extend_start.sh b/docker/neutron/neutron-base/extend_start.sh index 6d99826d62..32108209d2 100644 --- a/docker/neutron/neutron-base/extend_start.sh +++ b/docker/neutron/neutron-base/extend_start.sh @@ -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`. diff --git a/releasenotes/notes/bug-1936947-8beac926823cdf8f.yaml b/releasenotes/notes/bug-1936947-8beac926823cdf8f.yaml new file mode 100644 index 0000000000..75d862acc6 --- /dev/null +++ b/releasenotes/notes/bug-1936947-8beac926823cdf8f.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes wrong update-alternatives usage on CentOS. + `LP#1936947 `__