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
This commit is contained in:
parent
7c36bbfa00
commit
bafdab171d
@ -14,7 +14,7 @@ host_os_distributions:
|
|||||||
Debian:
|
Debian:
|
||||||
- "bullseye"
|
- "bullseye"
|
||||||
openEuler:
|
openEuler:
|
||||||
- "20.03"
|
- "22.03"
|
||||||
RHEL:
|
RHEL:
|
||||||
- "8"
|
- "8"
|
||||||
Rocky:
|
Rocky:
|
||||||
|
@ -23,7 +23,7 @@ Kolla Ansible supports the following host Operating Systems (OS):
|
|||||||
|
|
||||||
* CentOS Stream 8
|
* CentOS Stream 8
|
||||||
* Debian Bullseye (11)
|
* Debian Bullseye (11)
|
||||||
* openEuler 20.03 LTS SP2
|
* openEuler 22.03 LTS
|
||||||
* RHEL 8 (deprecated)
|
* RHEL 8 (deprecated)
|
||||||
* Rocky Linux 8
|
* Rocky Linux 8
|
||||||
* Ubuntu Focal (20.04)
|
* Ubuntu Focal (20.04)
|
||||||
|
@ -106,12 +106,10 @@
|
|||||||
# 1. iptables-legacy is used by default.
|
# 1. iptables-legacy is used by default.
|
||||||
# 2. NTP sync doesn't work by default.
|
# 2. NTP sync doesn't work by default.
|
||||||
- block:
|
- block:
|
||||||
# The CentOS Stream 8 in container uses iptables-nft while the host
|
# The Ubuntu 22.04 in container uses iptables-nft while the host
|
||||||
# openEuler uses iptables-legacy by default. We should update openEuler
|
# openEuler 22.03 uses iptables-legacy by default. We should update
|
||||||
# to keep iptables the same.
|
# openEuler to keep iptables the same.
|
||||||
# Ubuntu 20.04 container OS uses iptables-legacy by default. It works
|
- name: Set iptables from legacy to nft for container
|
||||||
# well on openEuler.
|
|
||||||
- name: Set iptables from legacy to nft for centos stream container
|
|
||||||
shell:
|
shell:
|
||||||
cmd: |
|
cmd: |
|
||||||
dnf install -y iptables-nft
|
dnf install -y iptables-nft
|
||||||
@ -119,10 +117,14 @@
|
|||||||
iptables-nft-restore < iptables.txt
|
iptables-nft-restore < iptables.txt
|
||||||
update-alternatives --set iptables /usr/sbin/iptables-nft
|
update-alternatives --set iptables /usr/sbin/iptables-nft
|
||||||
become: true
|
become: true
|
||||||
when: base_distro == 'centos'
|
|
||||||
|
|
||||||
# The command `timedatectl status` always times out if the command
|
# The command `timedatectl status` always times out if the command
|
||||||
# `timedatectl show-timesync` is not run first.
|
# `timedatectl show-timesync` is not run first.
|
||||||
|
- name: Install systemd-timesyncd
|
||||||
|
package:
|
||||||
|
name: systemd-timesyncd
|
||||||
|
state: present
|
||||||
|
become: True
|
||||||
- name: Let ntp service work
|
- name: Let ntp service work
|
||||||
shell: timedatectl show-timesync
|
shell: timedatectl show-timesync
|
||||||
become: true
|
become: true
|
||||||
|
@ -27,10 +27,10 @@
|
|||||||
- job:
|
- job:
|
||||||
name: kolla-ansible-openeuler-source
|
name: kolla-ansible-openeuler-source
|
||||||
parent: kolla-ansible-base
|
parent: kolla-ansible-base
|
||||||
nodeset: kolla-ansible-openeuler-20.03-lts-sp2
|
nodeset: kolla-ansible-openeuler-22.03-lts
|
||||||
voting: false
|
voting: false
|
||||||
vars:
|
vars:
|
||||||
base_distro: centos
|
base_distro: ubuntu
|
||||||
tls_enabled: true
|
tls_enabled: true
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
|
@ -40,10 +40,10 @@
|
|||||||
label: debian-bullseye
|
label: debian-bullseye
|
||||||
|
|
||||||
- nodeset:
|
- nodeset:
|
||||||
name: kolla-ansible-openeuler-20.03-lts-sp2
|
name: kolla-ansible-openeuler-22.03-lts
|
||||||
nodes:
|
nodes:
|
||||||
- name: primary
|
- name: primary
|
||||||
label: openEuler-20-03-LTS-SP2
|
label: openEuler-22-03-LTS
|
||||||
|
|
||||||
- nodeset:
|
- nodeset:
|
||||||
name: kolla-ansible-rocky-8
|
name: kolla-ansible-rocky-8
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
jobs:
|
jobs:
|
||||||
# - kolla-ansible-centos8s-source
|
# - kolla-ansible-centos8s-source
|
||||||
- kolla-ansible-debian-source
|
- kolla-ansible-debian-source
|
||||||
# - kolla-ansible-openeuler-source
|
- kolla-ansible-openeuler-source
|
||||||
# - kolla-ansible-rocky8-source
|
# - kolla-ansible-rocky8-source
|
||||||
- kolla-ansible-ubuntu-source
|
- kolla-ansible-ubuntu-source
|
||||||
# - kolla-ansible-centos8s-source-kvm
|
# - kolla-ansible-centos8s-source-kvm
|
||||||
|
Loading…
Reference in New Issue
Block a user