aboutsummaryrefslogtreecommitdiff
path: root/docker/neutron
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-10-12 15:18:26 +0000
committerGerrit Code Review <review@openstack.org>2020-10-12 15:18:26 +0000
commitc41c6568b447e5170a953de50084dd99ddc22436 (patch)
tree930f7f0670f731fa92655439d90e4d54e0d49534 /docker/neutron
parent524a821577d568a7a19983a7b6adc36e78fb9e4d (diff)
parent032804e5a0ddf89f7726880d1b57dd492d7d5c07 (diff)
downloadkolla-c41c6568b447e5170a953de50084dd99ddc22436.tar.gz
kolla-c41c6568b447e5170a953de50084dd99ddc22436.zip
Merge "Be strict about errors in start"
Diffstat (limited to 'docker/neutron')
-rw-r--r--docker/neutron/neutron-base/extend_start.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/neutron/neutron-base/extend_start.sh b/docker/neutron/neutron-base/extend_start.sh
index 82e087326..9e02422e9 100644
--- a/docker/neutron/neutron-base/extend_start.sh
+++ b/docker/neutron/neutron-base/extend_start.sh
@@ -9,6 +9,11 @@ fi
# set legacy iptables to allow kernels not supporting iptables-nft
if /usr/bin/update-alternatives --query 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`.
+ KOLLA_LEGACY_IPTABLES=${KOLLA_LEGACY_IPTABLES-false}
+
if [[ $KOLLA_LEGACY_IPTABLES == "true" ]]; then
sudo /usr/bin/update-alternatives --set iptables /usr/sbin/iptables-legacy
sudo /usr/bin/update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy