From bafdab171dfb3aed9d781e6a8505e1fd99864704 Mon Sep 17 00:00:00 2001
From: wangxiyuan <wangxiyuan1007@gmail.com>
Date: Mon, 8 Aug 2022 11:01:54 +0800
Subject: [PATCH] Upgrade openEuler Distro
openEuler 20.03 LTS SP2 is out of date. This patch:
1. Upgrade openEuler to 22.03 TLS for host OS.
2. Switch guest OS from centOS 8 to ubuntu
Change-Id: If2ff036e965def141f67240945802611e1f4dc4e
---
ansible/roles/prechecks/vars/main.yml | 2 +-
doc/source/user/support-matrix.rst | 2 +-
tests/pre.yml | 16 +++++++++-------
zuul.d/jobs.yaml | 4 ++--
zuul.d/nodesets.yaml | 4 ++--
zuul.d/project.yaml | 2 +-
6 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml
index 28aef928d3..a2bd800fce 100644
--- a/ansible/roles/prechecks/vars/main.yml
+++ b/ansible/roles/prechecks/vars/main.yml
@@ -14,7 +14,7 @@ host_os_distributions:
Debian:
- "bullseye"
openEuler:
- - "20.03"
+ - "22.03"
RHEL:
- "8"
Rocky:
diff --git a/doc/source/user/support-matrix.rst b/doc/source/user/support-matrix.rst
index a3d92451c8..891a593e46 100644
--- a/doc/source/user/support-matrix.rst
+++ b/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)
diff --git a/tests/pre.yml b/tests/pre.yml
index def38158af..75d12d14e0 100644
--- a/tests/pre.yml
+++ b/tests/pre.yml
@@ -106,12 +106,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
@@ -119,10 +117,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
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 4b7276ac77..405c098fc2 100644
--- a/zuul.d/jobs.yaml
+++ b/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:
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index eeb53421e6..1779ff2b34 100644
--- a/zuul.d/nodesets.yaml
+++ b/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
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 1fdc0e65ca..af2260f34f 100644
--- a/zuul.d/project.yaml
+++ b/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