Drop OpenEuler host OS support (due to no python3.10+)

ansible-core 2.16 and later requires python 3.10+ (see [1])

[1]: https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html#ansible-core-support-matrix

Change-Id: Id5e10872de413e7b476c5343360d73c109b9667a
This commit is contained in:
Michal Nasiadka 2024-07-03 08:25:42 +02:00
parent 3b948e5235
commit 8307e16fdc
10 changed files with 12 additions and 57 deletions

View File

@ -14,8 +14,6 @@ host_os_distributions:
Debian:
- "bullseye"
- "bookworm"
openEuler:
- "22.03"
Rocky:
- "9"
Ubuntu:

View File

@ -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:

View File

@ -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:

View File

@ -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)

View File

@ -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.

View File

@ -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

View File

@ -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 %}

View File

@ -44,15 +44,6 @@
tls_enabled: true
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

View File

@ -33,12 +33,6 @@
- name: secondary2
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:

View File

@ -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