From 45157f2f87a74f824f2c3e9820f2e388d7384b9f Mon Sep 17 00:00:00 2001
From: Qiu Jian <qiujian@yunionyun.com>
Date: Fri, 5 Jul 2024 12:31:21 +0800
Subject: [PATCH] fix: update openeuler lts sp3 20240705

---
 VERSION                                       |  2 +-
 .../setup_k8s/tasks/main.yml                  |  4 ++
 .../config-network-manager/tasks/main.yml     |  2 +-
 .../utils/detect-os/vars/openeuler-x86_64.yml | 42 +------------------
 .../roles/utils/kernel-check/tasks/main.yml   |  2 +
 5 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/VERSION b/VERSION
index b009aa33..38d36304 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v3.11.5
+v3.11.6
diff --git a/onecloud/roles/primary-master-node/setup_k8s/tasks/main.yml b/onecloud/roles/primary-master-node/setup_k8s/tasks/main.yml
index d34c9f4c..64c608d0 100644
--- a/onecloud/roles/primary-master-node/setup_k8s/tasks/main.yml
+++ b/onecloud/roles/primary-master-node/setup_k8s/tasks/main.yml
@@ -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
diff --git a/onecloud/roles/utils/config-network-manager/tasks/main.yml b/onecloud/roles/utils/config-network-manager/tasks/main.yml
index 2d26b04b..fc47520c 100644
--- a/onecloud/roles/utils/config-network-manager/tasks/main.yml
+++ b/onecloud/roles/utils/config-network-manager/tasks/main.yml
@@ -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:
diff --git a/onecloud/roles/utils/detect-os/vars/openeuler-x86_64.yml b/onecloud/roles/utils/detect-os/vars/openeuler-x86_64.yml
index 40ae0fe2..472b83d1 100644
--- a/onecloud/roles/utils/detect-os/vars/openeuler-x86_64.yml
+++ b/onecloud/roles/utils/detect-os/vars/openeuler-x86_64.yml
@@ -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:
diff --git a/onecloud/roles/utils/kernel-check/tasks/main.yml b/onecloud/roles/utils/kernel-check/tasks/main.yml
index af5185be..c27f5d05 100644
--- a/onecloud/roles/utils/kernel-check/tasks/main.yml
+++ b/onecloud/roles/utils/kernel-check/tasks/main.yml
@@ -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"