diff options
| author | Zuul <zuul@review.opendev.org> | 2019-10-16 12:22:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-10-16 12:22:13 +0000 |
| commit | ec57047f9e6dee49f0f4fe24942b0086b102a978 (patch) | |
| tree | e05bfeecad80e4993527e7347830a107ba122fca | |
| parent | c6fc801279bbc2320b3dcc53f2f392ee5f87d86d (diff) | |
| parent | e8289ff6df6b305a2f154a4aa6210c5d0bbb006f (diff) | |
| download | kolla-ec57047f9e6dee49f0f4fe24942b0086b102a978.tar.gz kolla-ec57047f9e6dee49f0f4fe24942b0086b102a978.zip | |
Merge "Neutron: add support to use legacy iptables"
| -rw-r--r-- | docker/neutron/neutron-base/extend_start.sh | 11 | ||||
| -rw-r--r-- | docker/neutron/neutron-base/neutron_sudoers | 4 |
2 files changed, 15 insertions, 0 deletions
diff --git a/docker/neutron/neutron-base/extend_start.sh b/docker/neutron/neutron-base/extend_start.sh index 12307fca1..82e087326 100644 --- a/docker/neutron/neutron-base/extend_start.sh +++ b/docker/neutron/neutron-base/extend_start.sh @@ -7,4 +7,15 @@ if [[ $(stat -c %a /var/log/kolla/neutron) != "755" ]]; then chmod 755 /var/log/kolla/neutron fi +# set legacy iptables to allow kernels not supporting iptables-nft +if /usr/bin/update-alternatives --query iptables; then + 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 + else + sudo /usr/bin/update-alternatives --auto iptables + sudo /usr/bin/update-alternatives --auto ip6tables + fi +fi + . /usr/local/bin/kolla_neutron_extend_start diff --git a/docker/neutron/neutron-base/neutron_sudoers b/docker/neutron/neutron-base/neutron_sudoers index c6459abe1..7a7252e50 100644 --- a/docker/neutron/neutron-base/neutron_sudoers +++ b/docker/neutron/neutron-base/neutron_sudoers @@ -1,2 +1,6 @@ neutron ALL = (root) NOPASSWD: /var/lib/kolla/venv/bin/neutron-rootwrap /etc/neutron/rootwrap.conf * neutron ALL = (root) NOPASSWD: /var/lib/kolla/venv/bin/neutron-rootwrap-daemon /etc/neutron/rootwrap.conf +neutron ALL = (root) NOPASSWD: /usr/bin/update-alternatives --set iptables /usr/sbin/iptables-legacy +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 |