Ansible: Rework grub command line

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I8abfc47e5e816e2ab4b39d7ad7575e672ae19ca6

46 files changed, 493 insertions, 20 deletions

diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.16.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.16.yaml
index 55dee36edc..fc7c0f8aea 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.16.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.16.yaml
@@ -3,9 +3,22 @@
 
 hostname: "t1-tg1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-17,19-35"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-17,19-35"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-17,19-35"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.17.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.17.yaml
index 9159af66e4..84a15a7813 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.17.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.17.yaml
@@ -3,9 +3,22 @@
 
 hostname: "t1-sut1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-17,19-35"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-17,19-35"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-17,19-35"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.18.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.18.yaml
index cda286675f..4c725d42fb 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.18.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.18.yaml
@@ -3,9 +3,22 @@
 
 hostname: "t1-sut2"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-17,19-35"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-17,19-35"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-17,19-35"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.20.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.20.yaml
index 6df8fd1970..761440bfa5 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.20.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.20.yaml
@@ -3,9 +3,22 @@
 
 hostname: "t2-tg1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-17,19-35"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-17,19-35"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-17,19-35"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml
index daa0eb14ce..a46118f012 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml
@@ -3,9 +3,22 @@
 
 hostname: "t2-sut1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-17,19-35"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-17,19-35"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-17,19-35"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml
index 49945304b6..23e2198f08 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml
@@ -3,9 +3,22 @@
 
 hostname: "t2-sut2"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-17,19-35"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-17,19-35"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-17,19-35"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.24.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.24.yaml
index e8c7e98267..7a8773848d 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.24.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.24.yaml
@@ -3,9 +3,22 @@
 
 hostname: "t3-tg1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-17,19-35"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-17,19-35"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-17,19-35"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.25.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.25.yaml
index e102a55631..0a9ff5ae2b 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.25.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.25.yaml
@@ -3,9 +3,22 @@
 
 hostname: "t3-sut1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-17,19-35"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-17,19-35"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-17,19-35"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.26.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.26.yaml
index 7cfae3635e..3c8dc7e56e 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.26.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.26.yaml
@@ -3,9 +3,22 @@
 
 hostname: "t3-sut2"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-17,19-35"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-17,19-35"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-17,19-35"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml
index 3469427eac..f3c0f02194 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml
@@ -3,8 +3,13 @@
 
 hostname: "s17-t33-sut1"
 grub:
+  audit: 0
+  intel_iommu: "on"
   isolcpus: "1-15,17-31,33-47,49-63"
+  nmi_watchdog: 0
   nohz_full: "1-15,17-31,33-47,49-63"
+  nosoftlockup: ""
+  processor.max_cstate: 1
   rcu_nocbs: "1-15,17-31,33-47,49-63"
 sysctl:
   kernel:
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml
index 64a56a8ebb..6fc9ade7cf 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml
@@ -3,8 +3,13 @@
 
 hostname: "s18-t33-sut2"
 grub:
+  audit: 0
+  intel_iommu: "on"
   isolcpus: "1-15,17-31,33-47,49-63"
+  nmi_watchdog: 0
   nohz_full: "1-15,17-31,33-47,49-63"
+  nosoftlockup: ""
+  processor.max_cstate: 1
   rcu_nocbs: "1-15,17-31,33-47,49-63"
 sysctl:
   kernel:
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.44.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.44.yaml
index d84043903e..ea47fc6cd4 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.44.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.44.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s3-t21-sut1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.45.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.45.yaml
index be5e1c686d..07be5403f1 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.45.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.45.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s4-t21-tg1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.46.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.46.yaml
index fff2a68bac..f18bf97b01 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.46.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.46.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s11-t31-sut1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.47.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.47.yaml
index 5ed6a9c6b6..ddce670af6 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.47.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.47.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s12-t31-sut2"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.48.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.48.yaml
index 3f13d1431a..e018927181 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.48.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.48.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s13-t31-tg1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml
index 629044d0bc..f23cf317f1 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s19-t33t34-tg1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
index 0904fca6de..20dc7a5880 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
@@ -3,8 +3,8 @@
 
 hostname: "s1-t11-sut1"
 grub:
+  hugepagesz: "2M"
   nr_hugepages: 65536
-
 inventory_ipmi_hostname: "10.30.50.47"
 cpu_microarchitecture: "skylake"
 
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
index f003f0d84d..f518fa5704 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
@@ -3,8 +3,8 @@
 
 hostname: "s2-t12-sut1"
 grub:
+  hugepagesz: "2M"
   nr_hugepages: 65536
-
 inventory_ipmi_hostname: "10.30.50.48"
 cpu_microarchitecture: "skylake"
 
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml
index 2522ecb5f7..1afc722b5c 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s5-t22-sut1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
index 05a38626f9..55cc75a1eb 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s6-t22-tg1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml
index cde66d0bb2..ee4231658d 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s7-t23-sut1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml
index bd45f3ad43..5c1cddb0ab 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s8-t23-tg1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml
index f16e3dcdbf..9486a777d3 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s9-t24-sut1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml
index d36d47f97a..2c549d6997 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s10-t24-tg1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml
index ab9f66616f..473f097a7f 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s14-t32-sut1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml
index 8e5c583f38..4454d364a1 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s15-t32-sut2"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.60.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.60.yaml
index e68ae5beda..871636b060 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.60.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.60.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s16-t32-tg1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml
index dfbe5a876b..8ed0639a1e 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml
@@ -3,15 +3,20 @@
 
 hostname: "s27-t13-sut1"
 grub:
+  audit: 0
+  intel_iommu: "on"
   isolcpus: "1-111,113-223"
+  nmi_watchdog: 0
   nohz_full: "1-111,113-223"
+  nosoftlockup: ""
+  processor.max_cstate: 1
   rcu_nocbs: "1-111,113-223"
 sysctl:
   kernel:
-  watchdog_cpumask: "0,112"
+    watchdog_cpumask: "0,112"
   vm:
-  nr_hugepages: 57344
-  max_map_count: 20000
+    nr_hugepages: 57344
+    max_map_count: 20000
 
 inventory_ipmi_hostname: "10.30.50.69"
 cpu_microarchitecture: "thunderx2"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
index da603c28ce..b7d2d15cf8 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
@@ -5,6 +5,7 @@ hostname: "s55-t36-sut1"
 inventory_ipmi_hostname: "10.30.50.70"
 vfs_data_file: "csit-initialize-vfs-tx2.sh"
 grub:
+  hugepagesz: "2M"
   nr_hugepages: 65536
 cpu_microarchitecture: "thunderx2"
 
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
index b5fb9cc4ec..a6cc611d73 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
@@ -5,6 +5,7 @@ hostname: "s56-t37-sut1"
 inventory_ipmi_hostname: "10.30.50.71"
 vfs_data_file: "csit-initialize-vfs-tx2.sh"
 grub:
+  hugepagesz: "2M"
   nr_hugepages: 65536
 cpu_microarchitecture: "thunderx2"
 
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.10.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.10.yaml
index 7f7860b5f3..83c5389f90 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.10.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.10.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s28-t26t35-tg1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.11.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.11.yaml
index 0ada8f08e3..9178e3070f 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.11.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.11.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s29-t26-sut1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-5"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-5"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-5"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.12.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.12.yaml
index 4e9302314a..a0b6ddc565 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.12.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.12.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s30-t35-sut1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-5"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-5"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-5"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.13.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.13.yaml
index 9cd28df16b..ff0454be72 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.13.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.13.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s31-t35-sut2"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-5"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-5"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-5"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml
index 63b3dde611..e209241ada 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s33-t27-sut1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-23,25-47,49-71,73-95"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-23,25-47,49-71,73-95"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-23,25-47,49-71,73-95"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,24,48,72"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml
index 1b1b76957d..a49f25ef23 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s34-t27-tg1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml
index f1b2b414c5..bbb01f60f4 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s35-t28-sut1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-23,25-47,49-71,73-95"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-23,25-47,49-71,73-95"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-23,25-47,49-71,73-95"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,24,48,72"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml
index 66febe13a8..ecd6b67803 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s36-t28-tg1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml
index ef3d3455f6..7a2f03dd2a 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s37-t29-sut1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-23,25-47,49-71,73-95"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-23,25-47,49-71,73-95"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-23,25-47,49-71,73-95"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,24,48,72"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml
index 2430f612b8..73f7e293e1 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml
@@ -3,9 +3,22 @@
 
 hostname: "s38-t29-tg1"
 grub:
+  audit: 0
+  hpet: "disable"
+  intel_idle.max_cstate: 1
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: 0
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 1
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml
index 2296e3db00..19bb6daeb3 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml
@@ -3,9 +3,19 @@
 
 hostname: "s60-t210-sut1"
 grub:
-  isolcpus: "0-15,17-31,33-47,49-63"
-  nohz_full: "0-15,17-31,33-47,49-63"
-  rcu_nocbs: "0-15,17-31,33-47,49-63"
+  amd_iommu: "on"
+  audit: 0
+  hpet: "disable"
+  iommu: "pt"
+  isolcpus: "1-15,17-31,33-47,49-63"
+  nmi_watchdog: 0
+  nohz_full: "off"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 0
+  rcu_nocbs: "1-15,17-31,33-47,49-63"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,16,32,48"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml
index 441f922d4e..6152cbe928 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml
@@ -3,9 +3,19 @@
 
 hostname: "s61-t210-tg1"
 grub:
-  isolcpus: "0-15,17-31,33-47,49-63"
-  nohz_full: "0-15,17-31,33-47,49-63"
-  rcu_nocbs: "0-15,17-31,33-47,49-63"
+  amd_iommu: "on"
+  audit: 0
+  hpet: "disable"
+  iommu: "pt"
+  isolcpus: "1-15,17-31,33-47,49-63"
+  nmi_watchdog: 0
+  nohz_full: "off"
+  nosoftlockup: ""
+  numa_balancing: "disable"
+  processor.max_cstate: 0
+  rcu_nocbs: "1-15,17-31,33-47,49-63"
+  tsc: "reliable"
+  vt.handoff: 1
 sysctl:
   kernel:
     watchdog_cpumask: "0,16,32,48"
diff --git a/resources/tools/testbed-setup/ansible/roles/performance_tuning/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/performance_tuning/defaults/main.yaml
index edec57aba0..612bc5a946 100644
--- a/resources/tools/testbed-setup/ansible/roles/performance_tuning/defaults/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/performance_tuning/defaults/main.yaml
@@ -14,10 +14,4 @@ packages_by_arch:
   aarch64:
     - []
   x86_64:
-    - []
-
-grub_cmdline_linux:
-  aarch64:
-    - "GRUB_CMDLINE_LINUX=\"isolcpus={{ grub.isolcpus }} nohz_full={{ grub.nohz_full }} rcu_nocbs={{ grub.rcu_nocbs }} intel_iommu=on nmi_watchdog=0 audit=0 nosoftlockup processor.max_cstate=1\""
-  x86_64:
-    - "GRUB_CMDLINE_LINUX=\"isolcpus={{ grub.isolcpus }} nohz_full={{ grub.nohz_full }} rcu_nocbs={{ grub.rcu_nocbs }} numa_balancing=disable intel_pstate=disable intel_iommu=on iommu=pt nmi_watchdog=0 audit=0 nosoftlockup processor.max_cstate=1 intel_idle.max_cstate=1 hpet=disable tsc=reliable mce=off\""
+    - []
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml
index 3a8f35b57f..c437b40f86 100644
--- a/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml
@@ -19,7 +19,7 @@
     path: "/etc/default/grub"
     state: "present"
     regexp: "^GRUB_CMDLINE_LINUX="
-    line: "{{ grub_cmdline_linux[ansible_machine] | join() }}"
+    line: "GRUB_CMDLINE_LINUX=\"{% for key, value in grub.items() %}{% if value %}{{key}}={{value}} {% else %}{{key}} {% endif %}{% endfor %}\""
   notify:
     - "Update GRUB"
   tags:
diff --git a/resources/tools/testbed-setup/ansible/roles/vpp_device/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/vpp_device/tasks/main.yaml
index b93853b01f..33b551715f 100644
--- a/resources/tools/testbed-setup/ansible/roles/vpp_device/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/vpp_device/tasks/main.yaml
@@ -82,7 +82,7 @@
     path: "/etc/default/grub"
     state: "present"
     regexp: "^GRUB_CMDLINE_LINUX="
-    line: 'GRUB_CMDLINE_LINUX="hugepagesz=2M hugepages={{ grub.nr_hugepages }}"'
+    line: "GRUB_CMDLINE_LINUX=\"{% for key, value in grub.items() %}{% if value %}{{key}}={{value}} {% else %}{{key}} {% endif %}{% endfor %}\""
   notify:
     - "Update GRUB"
     - "Reboot server"