Merge "Upgrade openEuler Distro"

ansible/roles/prechecks/vars/main.yml

@@ -14,7 +14,7 @@ host_os_distributions:
   Debian:
     - "bullseye"
   openEuler:
-    - "20.03"
+    - "22.03"
   RHEL:
     - "8"
   Rocky:

doc/source/user/support-matrix.rst

@@ -23,7 +23,7 @@ Kolla Ansible supports the following host Operating Systems (OS):
 
 * CentOS Stream 8
 * Debian Bullseye (11)
-* openEuler 20.03 LTS SP2
+* openEuler 22.03 LTS
 * RHEL 8 (deprecated)
 * Rocky Linux 8
 * Ubuntu Focal (20.04)

tests/pre.yml

@@ -105,12 +105,10 @@
     # 1. iptables-legacy is used by default.
     # 2. NTP sync doesn't work by default.
     - block:
-        # The CentOS Stream 8 in container uses iptables-nft while the host
-        # openEuler uses iptables-legacy by default. We should update openEuler
-        # to keep iptables the same.
-        # Ubuntu 20.04 container OS uses iptables-legacy by default. It works
-        # well on openEuler.
-        - name: Set iptables from legacy to nft for centos stream container
+        # 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
@@ -118,10 +116,14 @@
               iptables-nft-restore < iptables.txt
               update-alternatives --set iptables /usr/sbin/iptables-nft
           become: true
-          when: base_distro == 'centos'
 
         # 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

zuul.d/jobs.yaml

@@ -27,10 +27,10 @@
 - job:
     name: kolla-ansible-openeuler-source
     parent: kolla-ansible-base
-    nodeset: kolla-ansible-openeuler-20.03-lts-sp2
+    nodeset: kolla-ansible-openeuler-22.03-lts
     voting: false
     vars:
-      base_distro: centos
+      base_distro: ubuntu
       tls_enabled: true
 
 - job:

zuul.d/nodesets.yaml

@@ -40,10 +40,10 @@
         label: debian-bullseye
 
 - nodeset:
-    name: kolla-ansible-openeuler-20.03-lts-sp2
+    name: kolla-ansible-openeuler-22.03-lts
     nodes:
       - name: primary
-        label: openEuler-20-03-LTS-SP2
+        label: openEuler-22-03-LTS
 
 - nodeset:
     name: kolla-ansible-rocky-8

zuul.d/project.yaml

@@ -13,7 +13,7 @@
       jobs:
         # - kolla-ansible-centos8s-source
         - kolla-ansible-debian-source
-        # - kolla-ansible-openeuler-source
+        - kolla-ansible-openeuler-source
         # - kolla-ansible-rocky8-source
         - kolla-ansible-ubuntu-source
         # - kolla-ansible-centos8s-source-kvm