Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: update openeuler lts sp3 20240705
Browse files Browse the repository at this point in the history
Qiu Jian committed Aug 11, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 5f0e98a commit 45157f2
Showing 5 changed files with 9 additions and 43 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v3.11.5
v3.11.6
4 changes: 4 additions & 0 deletions onecloud/roles/primary-master-node/setup_k8s/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -10,6 +10,10 @@
shell: /opt/yunion/bin/ocadm token list | cut -d ' ' -f1 | sed -n '2p'
register: K8S_TOKEN

- name: Verify online status
ansible.builtin.debug:
msg: Online status is {{ online_status }} and offline_data_path is {{ offline_data_path }}

- name: loading images
include_role:
name: utils/load-images
2 changes: 1 addition & 1 deletion onecloud/roles/utils/config-network-manager/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
copy:
content: |
[keyfile]
unmanaged-devices=interface-name:cali*;interface-name:tunl*;interface-name:br*
unmanaged-devices=interface-name:cali*;interface-name:tunl*;interface-name:br*;interface-name:v*
dest: /etc/NetworkManager/conf.d/calico.conf
become: true
when:
42 changes: 1 addition & 41 deletions onecloud/roles/utils/detect-os/vars/openeuler-x86_64.yml
Original file line number Diff line number Diff line change
@@ -7,58 +7,18 @@ is_centos_based: true

common_packages:
- bash-completion
- boost-iostreams
- boost-random
- boost-system
- boost-thread
- bridge-utils
- celt051
- ceph-common
- conntrack-tools
- curl
- fuse
- fuse-devel
- fuse-libs
- gssproxy
- ipset
- ipvsadm
- jq
- keyutils
- kmod
- libbasicobjects
- libcollection
- libini_config
- libjpeg-turbo
- libnfsidmap
- libogg
- libpath_utils
- libpcap
- librados2
- librbd1
- libref_array
- libtirpc
- libusb
- libusbx
- libverto-libevent
- lm_sensors-libs
- nfs-utils
- nmap-ncat
- openvswitch
- openvswitch-2.12.4
- parallel
- pixman
- python3-libselinux
- quota
- quota-nls
- rpcbind
- rsync
- sysstat
- tcp_wrappers
- tcpdump
- unbound
- unbound-libs
- usbredir
- usbutils
- wget
- "{{ yunion_qemu_package }}"

common_services:
2 changes: 2 additions & 0 deletions onecloud/roles/utils/kernel-check/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -107,6 +107,7 @@
connect_timeout: 900 # 15 mins
become: yes
when:
- is_centos_x86 | default(false) | bool == true
- hugetlb_is_ready == false
- is_controller_node is not defined or is_controller_node|default(false)|bool == false
- ansible_connection == "ssh"
@@ -115,6 +116,7 @@
command: reboot
become: yes
when:
- is_centos_x86 | default(false) | bool == true
- hugetlb_is_ready == false
- is_controller_node is not defined or is_controller_node|default(false)|bool == false
- ansible_connection == "local"

0 comments on commit 45157f2

Please sign in to comment.