diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2021-10-28 09:17:17 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2021-10-29 09:59:51 +0000 |
| commit | 2d1bbe72579f9209e151133352d4d6761f764f33 (patch) | |
| tree | 66ecd4e51048051c94192d02a9e85ec073e0cdeb | |
| parent | 4b3ad066d1a7cf4e93fe774a140b09dd5eedc6a8 (diff) | |
| download | kolla-2d1bbe72579f9209e151133352d4d6761f764f33.tar.gz kolla-2d1bbe72579f9209e151133352d4d6761f764f33.zip | |
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
| -rw-r--r-- | docker/neutron/neutron-base/extend_start.sh | 3 | ||||
| -rw-r--r-- | releasenotes/notes/bug-1936947-8beac926823cdf8f.yaml | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/docker/neutron/neutron-base/extend_start.sh b/docker/neutron/neutron-base/extend_start.sh index 6d99826d6..32108209d 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 000000000..75d862acc --- /dev/null +++ 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>`__ |