Skip to content

Commit 4dfdde4

Browse files
mnasiadkayoctozepto
authored andcommitted
neutron: Fix update-alternatives on CentOS
Change-Id: I151420d3036410dd5ce6d90907d72dd3c20643b5 Closes-Bug: #1884778 (cherry picked from commit 7a4ba91)
1 parent d016f80 commit 4dfdde4

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

docker/neutron/neutron-base/extend_start.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,25 @@ fi
66
if [[ $(stat -c %a /var/log/kolla/neutron) != "755" ]]; then
77
chmod 755 /var/log/kolla/neutron
88
fi
9+
if [[ ${KOLLA_BASE_DISTRO} == "centos" ]]; then
10+
export UPDATE_ALTERNATIVES="/usr/sbin/update-alternatives"
11+
else
12+
export UPDATE_ALTERNATIVES="/usr/bin/update-alternatives"
13+
fi
914

1015
# set legacy iptables to allow kernels not supporting iptables-nft
11-
if /usr/bin/update-alternatives --query iptables; then
16+
if $UPDATE_ALTERNATIVES --query iptables; then
1217
# NOTE(yoctozepto): Kolla-Ansible does not always set KOLLA_LEGACY_IPTABLES;
1318
# the workaround below ensures it gets set to `false` in such cases to fix
1419
# this code under `set -o nounset`.
1520
KOLLA_LEGACY_IPTABLES=${KOLLA_LEGACY_IPTABLES-false}
1621

1722
if [[ $KOLLA_LEGACY_IPTABLES == "true" ]]; then
18-
sudo /usr/bin/update-alternatives --set iptables /usr/sbin/iptables-legacy
19-
sudo /usr/bin/update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
23+
sudo $UPDATE_ALTERNATIVES --set iptables /usr/sbin/iptables-legacy
24+
sudo $UPDATE_ALTERNATIVES --set ip6tables /usr/sbin/ip6tables-legacy
2025
else
21-
sudo /usr/bin/update-alternatives --auto iptables
22-
sudo /usr/bin/update-alternatives --auto ip6tables
26+
sudo $UPDATE_ALTERNATIVES --auto iptables
27+
sudo $UPDATE_ALTERNATIVES --auto ip6tables
2328
fi
2429
fi
2530

docker/neutron/neutron-base/neutron_sudoers

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ neutron ALL = (root) NOPASSWD: /usr/bin/update-alternatives --set iptables /usr/
44
neutron ALL = (root) NOPASSWD: /usr/bin/update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
55
neutron ALL = (root) NOPASSWD: /usr/bin/update-alternatives --auto iptables
66
neutron ALL = (root) NOPASSWD: /usr/bin/update-alternatives --auto ip6tables
7+
neutron ALL = (root) NOPASSWD: /usr/sbin/update-alternatives --set iptables /usr/sbin/iptables-legacy
8+
neutron ALL = (root) NOPASSWD: /usr/sbin/update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
9+
neutron ALL = (root) NOPASSWD: /usr/sbin/update-alternatives --auto iptables
10+
neutron ALL = (root) NOPASSWD: /usr/sbin/update-alternatives --auto ip6tables

0 commit comments

Comments
 (0)