CSIT-1448 Ansible: Clean hugepage configuration

Change-Id: I1e91d63bb5cd671d2d1d94f8711233bec0fe6505
Signed-off-by: Peter Mikus <pmikus@cisco.com>

29 files changed, 269 insertions, 61 deletions

diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml
index c464ad8da2..4d96a39496 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml
@@ -1,13 +1,13 @@
 ---
 # file: group_vars/all.yaml
 
-# General settings
+# General variables
 ansible_python_interpreter: '/usr/bin/python2.7'
 ansible_become_pass: '{{ inventory_sudo_pass }}'
-# Domain is used in /etc/hosts file on target machine.
-domain: 'linuxfoundation.org'
-# DNS is used in /etc/netplan/01-netcfg.yaml
-dns_servers: "[ 199.204.44.24, 199.204.47.54 ]"
+# name_servers_search is used in /etc/hosts file on target machine.
+name_servers_search: 'linuxfoundation.org'
+# name_servers is used in /etc/netplan/01-netcfg.yaml
+name_servers: "[ 199.204.44.24, 199.204.47.54 ]"
 
 # Proxy settings: Uncomment and fill the proper values. These variables will be
 # set globally by writing into /etc/environment file on target machine.
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 25401e33f3..3bf651e5e1 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.16.yaml
 
 hostname: "t1-tg1"
-isolcpus: "1-17,19-35"
-cfs_cpus: "0,18"
+grub:
+  isolcpus: "1-17,19-35"
+  nohz_full: "1-17,19-35"
+  rcu_nocbs: "1-17,19-35"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,18"
+  vm:
+    nr_hugepages: 4096
+    max_map_count: 20000
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 ac3f9fa310..558cfd4cbf 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.17.yaml
 
 hostname: "t1-sut1"
-isolcpus: "1-17,19-35"
-cfs_cpus: "0,18"
+grub:
+  isolcpus: "1-17,19-35"
+  nohz_full: "1-17,19-35"
+  rcu_nocbs: "1-17,19-35"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,18"
+  vm:
+    nr_hugepages: 36864
+    max_map_count: 20000
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 e96ed37d89..f33f7629b3 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.18.yaml
 
 hostname: "t1-sut2"
-isolcpus: "1-17,19-35"
-cfs_cpus: "0,18"
+grub:
+  isolcpus: "1-17,19-35"
+  nohz_full: "1-17,19-35"
+  rcu_nocbs: "1-17,19-35"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,18"
+  vm:
+    nr_hugepages: 36864
+    max_map_count: 20000
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 91eb9fc9ca..1ab5df17d1 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.20.yaml
 
 hostname: "t2-tg1"
-isolcpus: "1-17,19-35"
-cfs_cpus: "0,18"
+grub:
+  isolcpus: "1-17,19-35"
+  nohz_full: "1-17,19-35"
+  rcu_nocbs: "1-17,19-35"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,18"
+  vm:
+    nr_hugepages: 4096
+    max_map_count: 20000
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 84a72542e9..d3c552f384 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.21.yaml
 
 hostname: "t2-sut1"
-isolcpus: "1-17,19-35"
-cfs_cpus: "0,18"
+grub:
+  isolcpus: "1-17,19-35"
+  nohz_full: "1-17,19-35"
+  rcu_nocbs: "1-17,19-35"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,18"
+  vm:
+    nr_hugepages: 36864
+    max_map_count: 20000
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 5d7aaa5bee..1f6157f88d 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.22.yaml
 
 hostname: "t2-sut2"
-isolcpus: "1-17,19-35"
-cfs_cpus: "0,18"
+grub:
+  isolcpus: "1-17,19-35"
+  nohz_full: "1-17,19-35"
+  rcu_nocbs: "1-17,19-35"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,18"
+  vm:
+    nr_hugepages: 36864
+    max_map_count: 20000
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 88e5148dfb..cd4b466c7d 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.24.yaml
 
 hostname: "t3-tg1"
-isolcpus: "1-17,19-35"
-cfs_cpus: "0,18"
+grub:
+  isolcpus: "1-17,19-35"
+  nohz_full: "1-17,19-35"
+  rcu_nocbs: "1-17,19-35"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,18"
+  vm:
+    nr_hugepages: 4096
+    max_map_count: 20000
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 144e449b4a..402944bc44 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.25.yaml
 
 hostname: "t3-sut1"
-isolcpus: "1-17,19-35"
-cfs_cpus: "0,18"
+grub:
+  isolcpus: "1-17,19-35"
+  nohz_full: "1-17,19-35"
+  rcu_nocbs: "1-17,19-35"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,18"
+  vm:
+    nr_hugepages: 36864
+    max_map_count: 20000
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 d860ef216d..fdf70dffbe 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.26.yaml
 
 hostname: "t3-sut2"
-isolcpus: "1-17,19-35"
-cfs_cpus: "0,18"
+grub:
+  isolcpus: "1-17,19-35"
+  nohz_full: "1-17,19-35"
+  rcu_nocbs: "1-17,19-35"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,18"
+  vm:
+    nr_hugepages: 36864
+    max_map_count: 20000
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 e405b8064d..e015def65b 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
@@ -2,6 +2,14 @@
 # file: host_vars/10.30.51.36.yaml
 
 hostname: "s17-t33-sut1"
-isolcpus: "1-15,17-31,33-47,49-63"
-cfs_cpus: "0,16,32,48"
+grub:
+  isolcpus: "1-15,17-31,33-47,49-63"
+  nohz_full: "1-15,17-31,33-47,49-63"
+  rcu_nocbs: "1-15,17-31,33-47,49-63"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,16,32,48"
+  vm:
+    nr_hugepages: 4096
+    max_map_count: 20000
 taishan_workaround: True
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 ece3a752aa..e29c00a97c 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
@@ -2,6 +2,14 @@
 # file: host_vars/10.30.51.37.yaml
 
 hostname: "s18-t33-sut2"
-isolcpus: "1-15,17-31,33-47,49-63"
-cfs_cpus: "0,16,32,48"
+grub:
+  isolcpus: "1-15,17-31,33-47,49-63"
+  nohz_full: "1-15,17-31,33-47,49-63"
+  rcu_nocbs: "1-15,17-31,33-47,49-63"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,16,32,48"
+  vm:
+    nr_hugepages: 4096
+    max_map_count: 20000
 taishan_workaround: True
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 bdaeed5407..4776829b29 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.44.yaml
 
 hostname: "s3-t21-sut1"
-isolcpus: "1-27,29-55,57-83,85-111"
-cfs_cpus: "0,28,56,84"
+grub:
+  isolcpus: "1-27,29-55,57-83,85-111"
+  nohz_full: "1-27,29-55,57-83,85-111"
+  rcu_nocbs: "1-27,29-55,57-83,85-111"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,28,56,84"
+  vm:
+    nr_hugepages: 36864
+    max_map_count: 20000
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 d12c763516..2715ea7118 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.45.yaml
 
 hostname: "s4-t21-tg1"
-isolcpus: "1-27,29-55,57-83,85-111"
-cfs_cpus: "0,28,56,84"
+grub:
+  isolcpus: "1-27,29-55,57-83,85-111"
+  nohz_full: "1-27,29-55,57-83,85-111"
+  rcu_nocbs: "1-27,29-55,57-83,85-111"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,28,56,84"
+  vm:
+    nr_hugepages: 4096
+    max_map_count: 20000
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 8e38586f7f..850b206dd7 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.46.yaml
 
 hostname: "s11-t31-sut1"
-isolcpus: "1-27,29-55,57-83,85-111"
-cfs_cpus: "0,28,56,84"
+grub:
+  isolcpus: "1-27,29-55,57-83,85-111"
+  nohz_full: "1-27,29-55,57-83,85-111"
+  rcu_nocbs: "1-27,29-55,57-83,85-111"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,28,56,84"
+  vm:
+    nr_hugepages: 36864
+    max_map_count: 20000
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 a3d05730da..49da361833 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.47.yaml
 
 hostname: "s12-t31-sut2"
-isolcpus: "1-27,29-55,57-83,85-111"
-cfs_cpus: "0,28,56,84"
+grub:
+  isolcpus: "1-27,29-55,57-83,85-111"
+  nohz_full: "1-27,29-55,57-83,85-111"
+  rcu_nocbs: "1-27,29-55,57-83,85-111"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,28,56,84"
+  vm:
+    nr_hugepages: 36864
+    max_map_count: 20000
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 f6a77e8be3..ef18a47baa 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.48.yaml
 
 hostname: "s13-t31-tg1"
-isolcpus: "1-27,29-55,57-83,85-111"
-cfs_cpus: "0,28,56,84"
+grub:
+  isolcpus: "1-27,29-55,57-83,85-111"
+  nohz_full: "1-27,29-55,57-83,85-111"
+  rcu_nocbs: "1-27,29-55,57-83,85-111"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,28,56,84"
+  vm:
+    nr_hugepages: 4096
+    max_map_count: 20000
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 9aad58a00b..64439733f5 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.49.yaml
 
 hostname: "s19-t33t34-tg1"
-isolcpus: "1-27,29-55,57-83,85-111"
-cfs_cpus: "0,28,56,84"
+grub:
+  isolcpus: "1-27,29-55,57-83,85-111"
+  nohz_full: "1-27,29-55,57-83,85-111"
+  rcu_nocbs: "1-27,29-55,57-83,85-111"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,28,56,84"
+  vm:
+    nr_hugepages: 4096
+    max_map_count: 20000
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 55b8655e8c..87e336a958 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
@@ -2,5 +2,5 @@
 # file: host_vars/10.30.51.50.yaml
 
 hostname: "s1-t11-sut1"
-isolcpus: "1-27,29-55,57-83,85-111"
-cfs_cpus: "0,28,56,84"
+grub:
+  nr_hugepages: 65536
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 42eeea814d..ff2f805484 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
@@ -2,5 +2,5 @@
 # file: host_vars/10.30.51.51.yaml
 
 hostname: "s2-t12-sut1"
-isolcpus: "1-27,29-55,57-83,85-111"
-cfs_cpus: "0,28,56,84"
+grub:
+  nr_hugepages: 65536
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 7eb994a8a2..2bc3fdeb7a 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.52.yaml
 
 hostname: "s5-t22-sut1"
-isolcpus: "1-27,29-55,57-83,85-111"
-cfs_cpus: "0,28,56,84"
+grub:
+  isolcpus: "1-27,29-55,57-83,85-111"
+  nohz_full: "1-27,29-55,57-83,85-111"
+  rcu_nocbs: "1-27,29-55,57-83,85-111"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,28,56,84"
+  vm:
+    nr_hugepages: 65536
+    max_map_count: 20000
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 938bcecd30..c9c51b8444 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.53.yaml
 
 hostname: "s6-t22-tg1"
-isolcpus: "1-27,29-55,57-83,85-111"
-cfs_cpus: "0,28,56,84"
+grub:
+  isolcpus: "1-27,29-55,57-83,85-111"
+  nohz_full: "1-27,29-55,57-83,85-111"
+  rcu_nocbs: "1-27,29-55,57-83,85-111"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,28,56,84"
+  vm:
+    nr_hugepages: 4096
+    max_map_count: 20000
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 9a3de32d3d..877fab7806 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.54.yaml
 
 hostname: "s7-t23-sut1"
-isolcpus: "1-27,29-55,57-83,85-111"
-cfs_cpus: "0,28,56,84"
+grub:
+  isolcpus: "1-27,29-55,57-83,85-111"
+  nohz_full: "1-27,29-55,57-83,85-111"
+  rcu_nocbs: "1-27,29-55,57-83,85-111"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,28,56,84"
+  vm:
+    nr_hugepages: 36864
+    max_map_count: 20000
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 2014e01dea..b5fa1ac685 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.55.yaml
 
 hostname: "s8-t23-tg1"
-isolcpus: "1-27,29-55,57-83,85-111"
-cfs_cpus: "0,28,56,84"
+grub:
+  isolcpus: "1-27,29-55,57-83,85-111"
+  nohz_full: "1-27,29-55,57-83,85-111"
+  rcu_nocbs: "1-27,29-55,57-83,85-111"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,28,56,84"
+  vm:
+    nr_hugepages: 4096
+    max_map_count: 20000
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 1d926f56a9..d1efda22e3 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.56.yaml
 
 hostname: "s9-t24-sut1"
-isolcpus: "1-27,29-55,57-83,85-111"
-cfs_cpus: "0,28,56,84"
+grub:
+  isolcpus: "1-27,29-55,57-83,85-111"
+  nohz_full: "1-27,29-55,57-83,85-111"
+  rcu_nocbs: "1-27,29-55,57-83,85-111"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,28,56,84"
+  vm:
+    nr_hugepages: 36864
+    max_map_count: 20000
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 e5bddf33f8..162509deed 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.57.yaml
 
 hostname: "s10-t24-tg1"
-isolcpus: "1-27,29-55,57-83,85-111"
-cfs_cpus: "0,28,56,84"
+grub:
+  isolcpus: "1-27,29-55,57-83,85-111"
+  nohz_full: "1-27,29-55,57-83,85-111"
+  rcu_nocbs: "1-27,29-55,57-83,85-111"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,28,56,84"
+  vm:
+    nr_hugepages: 4096
+    max_map_count: 20000
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 0e854fdeb0..cb21647678 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.58.yaml
 
 hostname: "s14-t32-sut1"
-isolcpus: "1-27,29-55,57-83,85-111"
-cfs_cpus: "0,28,56,84"
+grub:
+  isolcpus: "1-27,29-55,57-83,85-111"
+  nohz_full: "1-27,29-55,57-83,85-111"
+  rcu_nocbs: "1-27,29-55,57-83,85-111"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,28,56,84"
+  vm:
+    nr_hugepages: 36864
+    max_map_count: 20000
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 4647606980..b38bea10ab 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.59.yaml
 
 hostname: "s15-t32-sut2"
-isolcpus: "1-27,29-55,57-83,85-111"
-cfs_cpus: "0,28,56,84"
+grub:
+  isolcpus: "1-27,29-55,57-83,85-111"
+  nohz_full: "1-27,29-55,57-83,85-111"
+  rcu_nocbs: "1-27,29-55,57-83,85-111"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,28,56,84"
+  vm:
+    nr_hugepages: 36864
+    max_map_count: 20000
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 27f5b45645..106fba7dd1 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
@@ -2,5 +2,13 @@
 # file: host_vars/10.30.51.60.yaml
 
 hostname: "s16-t32-tg1"
-isolcpus: "1-27,29-55,57-83,85-111"
-cfs_cpus: "0,28,56,84"
+grub:
+  isolcpus: "1-27,29-55,57-83,85-111"
+  nohz_full: "1-27,29-55,57-83,85-111"
+  rcu_nocbs: "1-27,29-55,57-83,85-111"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,28,56,84"
+  vm:
+    nr_hugepages: 4096
+    max_map_count: 20000