diff options
| author | Zuul <zuul@review.opendev.org> | 2020-11-08 20:42:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-11-08 20:42:56 +0000 |
| commit | 47338b80ef56feba864dddd3b70e5896bb052ab5 (patch) | |
| tree | 29478c2d9143b359aaa1b1094b2a2d157ae96f1c /docker | |
| parent | 8f73a83d2a8fefd5cb4ee1dc35ccb3d1501aec7d (diff) | |
| parent | 7a4ba91fa667a295a7e1023abfaa15e0874a371a (diff) | |
| download | kolla-47338b80ef56feba864dddd3b70e5896bb052ab5.tar.gz kolla-47338b80ef56feba864dddd3b70e5896bb052ab5.zip | |
Merge "neutron: Fix update-alternatives on CentOS"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-base/extend_start.sh | 15 | ||||
| -rw-r--r-- | docker/neutron/neutron-base/neutron_sudoers | 4 |
2 files changed, 14 insertions, 5 deletions
diff --git a/docker/neutron/neutron-base/extend_start.sh b/docker/neutron/neutron-base/extend_start.sh index 9e02422e9..6d99826d6 100644 --- a/docker/neutron/neutron-base/extend_start.sh +++ b/docker/neutron/neutron-base/extend_start.sh @@ -6,20 +6,25 @@ fi if [[ $(stat -c %a /var/log/kolla/neutron) != "755" ]]; then chmod 755 /var/log/kolla/neutron fi +if [[ ${KOLLA_BASE_DISTRO} == "centos" ]]; then + export UPDATE_ALTERNATIVES="/usr/sbin/update-alternatives" +else + export UPDATE_ALTERNATIVES="/usr/bin/update-alternatives" +fi # set legacy iptables to allow kernels not supporting iptables-nft -if /usr/bin/update-alternatives --query iptables; then +if $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 + sudo $UPDATE_ALTERNATIVES --set iptables /usr/sbin/iptables-legacy + sudo $UPDATE_ALTERNATIVES --set ip6tables /usr/sbin/ip6tables-legacy else - sudo /usr/bin/update-alternatives --auto iptables - sudo /usr/bin/update-alternatives --auto ip6tables + sudo $UPDATE_ALTERNATIVES --auto iptables + sudo $UPDATE_ALTERNATIVES --auto ip6tables fi fi diff --git a/docker/neutron/neutron-base/neutron_sudoers b/docker/neutron/neutron-base/neutron_sudoers index 7a7252e50..348ff0fbd 100644 --- a/docker/neutron/neutron-base/neutron_sudoers +++ b/docker/neutron/neutron-base/neutron_sudoers @@ -4,3 +4,7 @@ neutron ALL = (root) NOPASSWD: /usr/bin/update-alternatives --set iptables /usr/ neutron ALL = (root) NOPASSWD: /usr/bin/update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy neutron ALL = (root) NOPASSWD: /usr/bin/update-alternatives --auto iptables neutron ALL = (root) NOPASSWD: /usr/bin/update-alternatives --auto ip6tables +neutron ALL = (root) NOPASSWD: /usr/sbin/update-alternatives --set iptables /usr/sbin/iptables-legacy +neutron ALL = (root) NOPASSWD: /usr/sbin/update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy +neutron ALL = (root) NOPASSWD: /usr/sbin/update-alternatives --auto iptables +neutron ALL = (root) NOPASSWD: /usr/sbin/update-alternatives --auto ip6tables |