diff options
| author | Zuul <zuul@review.opendev.org> | 2026-09-11 13:48:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-09-11 13:48:44 +0000 |
| commit | 12e3cf2085de6066822a7d77f017d36b0a8e554d (patch) | |
| tree | d4cb74bb69ceed5e9792cbd8b54be055aaae009c /kolla/docker/neutron | |
| parent | d9c5e083132c41fe03af0d256ae883ba1219d1c7 (diff) | |
| parent | f1d7da742d058d893f6abf3c0a21efaf940187b4 (diff) | |
| download | kolla-12e3cf2085de6066822a7d77f017d36b0a8e554d.tar.gz kolla-12e3cf2085de6066822a7d77f017d36b0a8e554d.zip | |
Merge "Drop support for CentOS Stream 10"
Diffstat (limited to 'kolla/docker/neutron')
| -rw-r--r-- | kolla/docker/neutron/neutron-base/extend_start.sh | 2 | ||||
| -rw-r--r-- | kolla/docker/neutron/neutron-l3-agent/extend_start.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kolla/docker/neutron/neutron-base/extend_start.sh b/kolla/docker/neutron/neutron-base/extend_start.sh index e2a2dfca4..6e6288ffb 100644 --- a/kolla/docker/neutron/neutron-base/extend_start.sh +++ b/kolla/docker/neutron/neutron-base/extend_start.sh @@ -14,7 +14,7 @@ fi # so no need to even use u-a on RHEL 9 family as there is one provider # (and there is no u-a for ip6tables so script fails) -if [[ ! ${KOLLA_BASE_DISTRO} =~ centos|rocky ]]; then +if [[ ! ${KOLLA_BASE_DISTRO} =~ rocky ]]; then if /usr/bin/update-alternatives --display 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 diff --git a/kolla/docker/neutron/neutron-l3-agent/extend_start.sh b/kolla/docker/neutron/neutron-l3-agent/extend_start.sh index f95c1eda2..4c7cd345f 100644 --- a/kolla/docker/neutron/neutron-l3-agent/extend_start.sh +++ b/kolla/docker/neutron/neutron-l3-agent/extend_start.sh @@ -12,7 +12,7 @@ fi # nftables framework." # so no need to even use u-a on RHEL 9 family as there is one provider # (and there is no u-a for ip6tables so script fails) -if [[ ! ${KOLLA_BASE_DISTRO} =~ centos|rocky ]]; then +if [[ ! ${KOLLA_BASE_DISTRO} =~ rocky ]]; then if /usr/bin/update-alternatives --display 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 |