File tree Expand file tree Collapse file tree 2 files changed +14
-5
lines changed
docker/neutron/neutron-base Expand file tree Collapse file tree 2 files changed +14
-5
lines changed Original file line number Diff line number Diff line change 6
6
if [[ $( stat -c %a /var/log/kolla/neutron) != " 755" ]]; then
7
7
chmod 755 /var/log/kolla/neutron
8
8
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
9
14
10
15
# 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
12
17
# NOTE(yoctozepto): Kolla-Ansible does not always set KOLLA_LEGACY_IPTABLES;
13
18
# the workaround below ensures it gets set to `false` in such cases to fix
14
19
# this code under `set -o nounset`.
15
20
KOLLA_LEGACY_IPTABLES=${KOLLA_LEGACY_IPTABLES-false}
16
21
17
22
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
20
25
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
23
28
fi
24
29
fi
25
30
Original file line number Diff line number Diff line change @@ -4,3 +4,7 @@ neutron ALL = (root) NOPASSWD: /usr/bin/update-alternatives --set iptables /usr/
4
4
neutron ALL = (root) NOPASSWD: /usr/bin/update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
5
5
neutron ALL = (root) NOPASSWD: /usr/bin/update-alternatives --auto iptables
6
6
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
You can’t perform that action at this time.
0 commit comments