Merge pull request #150 from stackhpc/upstream/wallaby-2022-07-25

Synchronise wallaby with upstream
stackhpc · Jul 25, 2022 · e2fb1ce · e2fb1ce
2 parents edd4eba + 1cc710d
commit e2fb1ce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes wrong update-alternatives usage on CentOS.
+    `LP#1936947 <https://launchpad.net/bugs/1936947>`__