From 43b163efdcfc9f794252092dbaab6d0494b04b76 Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Sat, 7 May 2022 15:53:41 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:TSG-10492:=E9=80=9A=E8=BF=87=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9grub.cfg=E6=96=87=E4=BB=B6=E6=9D=A5=E5=AE=9E=E7=8E=B0c?=
 =?UTF-8?q?pu=20isolate=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system-init-TSG-X-P1403/tasks/main.yml    |  6 ------
 .../templates/grub.j2.j2                      |  1 -
 .../files/script/provision-config-apply       |  2 +-
 .../tasks/provision.yml.TSGXNXR620G40R01P0804 | 20 +++++++++----------
 4 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 ansible/roles/system-init-TSG-X-P1403/templates/grub.j2.j2

diff --git a/ansible/roles/system-init-TSG-X-P1403/tasks/main.yml b/ansible/roles/system-init-TSG-X-P1403/tasks/main.yml
index dbf2ca37..1d821428 100644
--- a/ansible/roles/system-init-TSG-X-P1403/tasks/main.yml
+++ b/ansible/roles/system-init-TSG-X-P1403/tasks/main.yml
@@ -66,12 +66,6 @@
     dest: /usr/lib/systemd/system/system.slice.d/50-MemoryLimit.conf
     mode: 0644
 
-- name: Template the grub config 
-  template:
-    src: "{{ role_path }}/templates/grub.j2.j2"
-    dest: /opt/tsg/tsg-os-provision/templates/grub.j2
-  tags: template
-
 # 启用 IPMI
 - name: "copy ipmi.conf to /etc/sysconfig/ipmi"
   copy:
diff --git a/ansible/roles/system-init-TSG-X-P1403/templates/grub.j2.j2 b/ansible/roles/system-init-TSG-X-P1403/templates/grub.j2.j2
deleted file mode 100644
index 2af9d383..00000000
--- a/ansible/roles/system-init-TSG-X-P1403/templates/grub.j2.j2
+++ /dev/null
@@ -1 +0,0 @@
-GRUB_CMDLINE_LINUX="crashkernel=512M default_hugepagesz=1G hugepagesz=1G hugepages=16 intel_iommu=on iommu=pt mitigations=off psi=1 isolcpus={% raw %}{{ grub_cpu_isolate }}{% endraw %}"
\ No newline at end of file
diff --git a/ansible/roles/tsg-os-provision/files/script/provision-config-apply b/ansible/roles/tsg-os-provision/files/script/provision-config-apply
index 75a8b934..7e8b19e0 100644
--- a/ansible/roles/tsg-os-provision/files/script/provision-config-apply
+++ b/ansible/roles/tsg-os-provision/files/script/provision-config-apply
@@ -39,7 +39,7 @@ if [ "$(id -u)" != 0 ]; then
 fi
 
 if [ $reboot_required == 1 ]; then
-    /opt/tsg/tsg-os-provision/scripts/provision.sh 0
+    /opt/tsg/tsg-os-provision/scripts/provision.sh 2
     echo "Reboot..."
     reboot
 else
diff --git a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.TSGXNXR620G40R01P0804 b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.TSGXNXR620G40R01P0804
index d6efcd6d..8f85b6cc 100644
--- a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.TSGXNXR620G40R01P0804
+++ b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.TSGXNXR620G40R01P0804
@@ -103,7 +103,7 @@
         msg: "Detected that the configuration of cpu isolate has changed, please run command \"provision-config-apply --reboot\" to reboot the machine that make the configuration take effect!"
       when:
         - result_exec_cat_cmdline is not search(grub_cpu_isolate)
-        - enable_config_apply == '1'
+        - enable_config_apply != '2'
 
     - name: "set keep_alive_ip"
       set_fact:
@@ -114,16 +114,14 @@
         cm_policy_server_ip: "{{cm.policy_server.address}}"
         cm_policy_server_port: "{{ cm.policy_server.port }}"
 
-    - name: "template grub config for cpu isolate"
-      template:
-        src: ../templates/grub.j2
-        dest: /etc/default/grub
-
-    - name: "update grub: BIOS"
-      shell: grub2-mkconfig -o /boot/grub2/grub.cfg
-
-    - name: "update grub: EFI"
-      shell: grub2-mkconfig -o /boot/efi/EFI/rocky/grub.cfg
+    - name: "replace action: grub config isolate cpu"
+      replace:
+        path: "{{ item }}"
+        regexp: 'isolcpus=\d+-+\d+'
+        replace: 'isolcpus={{grub_cpu_isolate}}'
+      with_items:
+        - /boot/grub/grub.cfg
+        - /etc/grub.d/40_onie_grub
 
     - name: "tsg-os-provision: Template the conflist.inf"
       template: