diff options
| -rw-r--r-- | ansible/roles/prechecks/vars/main.yml | 2 | ||||
| -rw-r--r-- | doc/source/user/quickstart-development.rst | 4 | ||||
| -rw-r--r-- | doc/source/user/quickstart.rst | 4 | ||||
| -rw-r--r-- | doc/source/user/support-matrix.rst | 1 | ||||
| -rw-r--r-- | releasenotes/notes/drop-openeuler-support-ab48de4656af2485.yaml | 6 | ||||
| -rw-r--r-- | tests/pre.yml | 28 | ||||
| -rw-r--r-- | tests/templates/globals-default.j2 | 8 | ||||
| -rw-r--r-- | zuul.d/jobs.yaml | 9 | ||||
| -rw-r--r-- | zuul.d/nodesets.yaml | 6 | ||||
| -rw-r--r-- | zuul.d/project.yaml | 1 |
10 files changed, 12 insertions, 57 deletions
diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml index cc1d1145b..afe1ecf13 100644 --- a/ansible/roles/prechecks/vars/main.yml +++ b/ansible/roles/prechecks/vars/main.yml @@ -14,8 +14,6 @@ host_os_distributions: Debian: - "bullseye" - "bookworm" - openEuler: - - "22.03" Rocky: - "9" Ubuntu: diff --git a/doc/source/user/quickstart-development.rst b/doc/source/user/quickstart-development.rst index 9bb396b2f..e769ecbb5 100644 --- a/doc/source/user/quickstart-development.rst +++ b/doc/source/user/quickstart-development.rst @@ -48,7 +48,7 @@ execution, which is described in #. Install Python build dependencies: - For CentOS, Rocky or openEuler, run: + For CentOS or Rocky, run: .. code-block:: console @@ -65,7 +65,7 @@ Install dependencies for the virtual environment #. Install the virtual environment dependencies. - For CentOS, Rocky or openEuler, you don't need to do anything. + For CentOS or Rocky, you don't need to do anything. For Debian or Ubuntu, run: diff --git a/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst index 4fab56549..513f495c4 100644 --- a/doc/source/user/quickstart.rst +++ b/doc/source/user/quickstart.rst @@ -48,7 +48,7 @@ execution, which is described in #. Install Python build dependencies: - For CentOS, Rocky or openEuler, run: + For CentOS or Rocky, run: .. code-block:: console @@ -65,7 +65,7 @@ Install dependencies for the virtual environment #. Install the virtual environment dependencies. - For CentOS, Rocky or openEuler, you don't need to do anything. + For CentOS or Rocky, you don't need to do anything. For Debian or Ubuntu, run: diff --git a/doc/source/user/support-matrix.rst b/doc/source/user/support-matrix.rst index 3ca14ac7e..a92cf4ba2 100644 --- a/doc/source/user/support-matrix.rst +++ b/doc/source/user/support-matrix.rst @@ -15,7 +15,6 @@ Kolla Ansible supports the following host Operating Systems (OS): * CentOS Stream 9 * Debian Bookworm (12) -* openEuler 22.03 LTS * Rocky Linux 9 * Ubuntu Jammy (22.04) diff --git a/releasenotes/notes/drop-openeuler-support-ab48de4656af2485.yaml b/releasenotes/notes/drop-openeuler-support-ab48de4656af2485.yaml new file mode 100644 index 000000000..267fc4003 --- /dev/null +++ b/releasenotes/notes/drop-openeuler-support-ab48de4656af2485.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Support for OpenEuler host operating system has been dropped, due to no + recent (3.10+) python availability that is required by ansible-core 2.16 + and later. diff --git a/tests/pre.yml b/tests/pre.yml index f7614ab96..d4247ad33 100644 --- a/tests/pre.yml +++ b/tests/pre.yml @@ -120,34 +120,6 @@ use: systemd become: true - # NOTE(wxy): There are some issues on openEuler, fix them by hand. - # 1. iptables-legacy is used by default. - # 2. NTP sync doesn't work by default. - - block: - # The Ubuntu 22.04 in container uses iptables-nft while the host - # openEuler 22.03 uses iptables-legacy by default. We should update - # openEuler to keep iptables the same. - - name: Set iptables from legacy to nft for container - shell: - cmd: | - dnf install -y iptables-nft - iptables-save > iptables.txt - iptables-nft-restore < iptables.txt - update-alternatives --set iptables /usr/sbin/iptables-nft - become: true - - # The command `timedatectl status` always times out if the command - # `timedatectl show-timesync` is not run first. - - name: Install systemd-timesyncd - package: - name: systemd-timesyncd - state: present - become: True - - name: Let ntp service work - shell: timedatectl show-timesync - become: true - when: ansible_facts.distribution == 'openEuler' - - name: Wait for ntp time sync command: timedatectl status register: timedatectl_status diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index 189892488..32617b88b 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -1,6 +1,6 @@ --- -{% if ansible_os_family == 'Debian' or ansible_facts.distribution == "openEuler" %} -# Force the use of python3 on Debian, Ubuntu and openEuler remote hosts. These distros +{% if ansible_os_family == 'Debian' %} +# Force the use of python3 on Debian and Ubuntu remote hosts. These distros # typically have an unversioned Python interpreter which links to python2.7. ansible_python_interpreter: /usr/bin/python3 {% endif %} @@ -37,10 +37,6 @@ docker_custom_config: insecure-registries: - primary:4000 {% endif %} -{% if ansible_facts.distribution == "openEuler" %} -docker_custom_config: - exec-opts: ["native.umask=normal"] -{% endif %} {% endif %} {% if kolla_python_version is defined and not is_previous_release %} diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index b9ddb93f7..c2a52e755 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -45,15 +45,6 @@ container_engine: podman - job: - name: kolla-ansible-openeuler - parent: kolla-ansible-base - nodeset: kolla-ansible-openeuler-22.03-lts - voting: false - vars: - base_distro: ubuntu - tls_enabled: true - -- job: name: kolla-ansible-rocky9 parent: kolla-ansible-base nodeset: kolla-ansible-rocky9 diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index e268979e9..4e57959dd 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -34,12 +34,6 @@ label: debian-bookworm - nodeset: - name: kolla-ansible-openeuler-22.03-lts - nodes: - - name: primary - label: openEuler-22-03-LTS - -- nodeset: name: kolla-ansible-rocky9 nodes: - name: primary diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index d0238b02c..929eb7d41 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -14,7 +14,6 @@ - kolla-ansible-centos9s - kolla-ansible-debian - kolla-ansible-debian-podman - - kolla-ansible-openeuler - kolla-ansible-rocky9 - kolla-ansible-rocky9-podman - kolla-ansible-ubuntu |