diff options
| author | Zuul <zuul@review.opendev.org> | 2021-11-01 12:49:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-11-01 12:49:23 +0000 |
| commit | 5e40e0894f1a6e8d7a06ddff274d6420b51f0266 (patch) | |
| tree | c44d2b225445d0d705ad4d34bd083cc4b40ddaa9 | |
| parent | 896480988843dc22303e42b9170808d20829970b (diff) | |
| parent | 2d1bbe72579f9209e151133352d4d6761f764f33 (diff) | |
| download | kolla-5e40e0894f1a6e8d7a06ddff274d6420b51f0266.tar.gz kolla-5e40e0894f1a6e8d7a06ddff274d6420b51f0266.zip | |
Merge "neutron: Use update-alternatives --display instead of --query"
| -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>`__ |