215 files changed, 130 insertions, 285 deletions

diff --git a/resources/tools/testbed-setup/ansible/.gitignore b/fdio.infra.ansible/.gitignore
index bed1e33b88..bed1e33b88 100644
--- a/resources/tools/testbed-setup/ansible/.gitignore
+++ b/fdio.infra.ansible/.gitignore
diff --git a/resources/tools/testbed-setup/ansible/cloud_topology.yaml b/fdio.infra.ansible/cloud_topology.yaml
index 083a3bd368..083a3bd368 100644
--- a/resources/tools/testbed-setup/ansible/cloud_topology.yaml
+++ b/fdio.infra.ansible/cloud_topology.yaml
diff --git a/resources/tools/testbed-setup/ansible/dev.yaml b/fdio.infra.ansible/dev.yaml
index 6f6d2a7cb5..6f6d2a7cb5 100644
--- a/resources/tools/testbed-setup/ansible/dev.yaml
+++ b/fdio.infra.ansible/dev.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml b/fdio.infra.ansible/inventories/lf_inventory/group_vars/all.yaml
index 0756621eef..0756621eef 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/group_vars/all.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.16.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.16.yaml
index 660e33ee53..660e33ee53 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.16.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.16.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.17.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.17.yaml
index 48e5083332..48e5083332 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.17.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.17.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.18.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.18.yaml
index f823ed6406..f823ed6406 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.18.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.18.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.20.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.20.yaml
index 68af6e81f7..68af6e81f7 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.20.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.20.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml
index 0d43874ae3..0d43874ae3 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml
index 797606a353..797606a353 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.24.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.24.yaml
index 25bb536f81..25bb536f81 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.24.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.24.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.25.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.25.yaml
index db02aa7816..db02aa7816 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.25.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.25.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.26.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.26.yaml
index 0e97bd0fd2..0e97bd0fd2 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.26.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.26.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml
index bf1da2a759..bf1da2a759 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.29.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.29.yaml
index 5b3a1725b3..5b3a1725b3 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.29.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.29.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml
index 13306a74a9..13306a74a9 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.32.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.32.yaml
index a52008f023..a52008f023 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.32.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.32.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.33.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.33.yaml
index 7ab2f823cb..7ab2f823cb 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.33.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.33.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.34.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.34.yaml
index a45cda8e86..a45cda8e86 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.34.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.34.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.35.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.35.yaml
index f609a839c4..f609a839c4 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.35.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.35.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml
index f57c8df45f..f57c8df45f 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml
index 90fe27e275..90fe27e275 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.38.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.38.yaml
index 77fee7377b..77fee7377b 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.38.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.38.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.39.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.39.yaml
index da66a5e293..da66a5e293 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.39.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.39.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml
index 58839c8365..58839c8365 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.44.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.44.yaml
index 2b06831186..2b06831186 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.44.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.44.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.45.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.45.yaml
index 9818f826c9..9818f826c9 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.45.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.45.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.46.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.46.yaml
index 24be5e2e54..24be5e2e54 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.46.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.46.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.47.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.47.yaml
index 7b59ff1606..7b59ff1606 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.47.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.47.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.48.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.48.yaml
index d69fd03edc..d69fd03edc 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.48.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.48.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml
index 9e6d17fb8f..9e6d17fb8f 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
index f3b8886a72..f3b8886a72 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
index 019cd5a968..019cd5a968 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml
index 4a4ccc0d91..4a4ccc0d91 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
index f0a50bfb71..f0a50bfb71 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml
index b51eed468f..b51eed468f 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml
index 4b144fa69b..4b144fa69b 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml
index 613c9b110c..613c9b110c 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml
index 52ec3d9911..52ec3d9911 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml
index 8971b4a7bb..8971b4a7bb 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml
index ed39581e30..ed39581e30 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.60.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.60.yaml
index 1e3a49cf1d..1e3a49cf1d 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.60.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.60.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.65.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.65.yaml
index 76b330ae2e..76b330ae2e 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.65.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.65.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.66.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.66.yaml
index 5223e4ba11..5223e4ba11 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.66.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.66.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.67.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.67.yaml
index da9ed6da49..da9ed6da49 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.67.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.67.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.68.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.68.yaml
index 0295af4dbd..0295af4dbd 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.68.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.68.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml
index 264c62cf38..264c62cf38 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
index caf80df9ca..caf80df9ca 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
index 1be446f288..1be446f288 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.10.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.10.yaml
index 05f1a19576..05f1a19576 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.10.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.10.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.11.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.11.yaml
index c6cb68cb5d..c6cb68cb5d 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.11.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.11.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.12.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.12.yaml
index 5d350647a9..5d350647a9 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.12.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.12.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.13.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.13.yaml
index aff600265c..aff600265c 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.13.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.13.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml
index c609cc7875..c609cc7875 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml
index c9825c7830..c9825c7830 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml
index 1d952556f9..1d952556f9 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.17.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.17.yaml
index 2feac858d9..2feac858d9 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.17.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.17.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml
index 6fe0dbc14d..6fe0dbc14d 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml
index f963d4b888..f963d4b888 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml
index 6913550686..6913550686 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml
index 98cffb3392..98cffb3392 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml
index f58b2ce07d..f58b2ce07d 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml
index 364ab8b295..364ab8b295 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml
index dc8a060cc0..dc8a060cc0 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml
index 8c99bf3cae..8c99bf3cae 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts b/fdio.infra.ansible/inventories/lf_inventory/hosts
index cc0e0b3986..cc0e0b3986 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts
+++ b/fdio.infra.ansible/inventories/lf_inventory/hosts
diff --git a/resources/tools/testbed-setup/ansible/inventories/sample_inventory/group_vars/all.yaml b/fdio.infra.ansible/inventories/sample_inventory/group_vars/all.yaml
index f9938d20da..f9938d20da 100644
--- a/resources/tools/testbed-setup/ansible/inventories/sample_inventory/group_vars/all.yaml
+++ b/fdio.infra.ansible/inventories/sample_inventory/group_vars/all.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/sample_inventory/host_vars/1.1.1.1.yaml b/fdio.infra.ansible/inventories/sample_inventory/host_vars/1.1.1.1.yaml
index fc4a8af1a8..fc4a8af1a8 100644
--- a/resources/tools/testbed-setup/ansible/inventories/sample_inventory/host_vars/1.1.1.1.yaml
+++ b/fdio.infra.ansible/inventories/sample_inventory/host_vars/1.1.1.1.yaml
diff --git a/resources/tools/testbed-setup/ansible/inventories/sample_inventory/hosts b/fdio.infra.ansible/inventories/sample_inventory/hosts
index e8e1439db4..e8e1439db4 100644
--- a/resources/tools/testbed-setup/ansible/inventories/sample_inventory/hosts
+++ b/fdio.infra.ansible/inventories/sample_inventory/hosts
diff --git a/resources/tools/testbed-setup/ansible/nomad.yaml b/fdio.infra.ansible/nomad.yaml
index ae9de1e524..ae9de1e524 100644
--- a/resources/tools/testbed-setup/ansible/nomad.yaml
+++ b/fdio.infra.ansible/nomad.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/ab/defaults/main.yaml b/fdio.infra.ansible/roles/ab/defaults/main.yaml
index 45b80be42d..45b80be42d 100644
--- a/resources/tools/testbed-setup/ansible/roles/ab/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/ab/defaults/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/ab/tasks/main.yaml b/fdio.infra.ansible/roles/ab/tasks/main.yaml
index 37e702e6df..37e702e6df 100644
--- a/resources/tools/testbed-setup/ansible/roles/ab/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/ab/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/aws/defaults/main.yaml b/fdio.infra.ansible/roles/aws/defaults/main.yaml
index d4ea91afd4..d4ea91afd4 100644
--- a/resources/tools/testbed-setup/ansible/roles/aws/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/aws/defaults/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/aws/handlers/main.yaml b/fdio.infra.ansible/roles/aws/handlers/main.yaml
index 7363dc2c34..7363dc2c34 100644
--- a/resources/tools/testbed-setup/ansible/roles/aws/handlers/main.yaml
+++ b/fdio.infra.ansible/roles/aws/handlers/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/aws/tasks/main.yaml b/fdio.infra.ansible/roles/aws/tasks/main.yaml
index 2d209762c3..2d209762c3 100644
--- a/resources/tools/testbed-setup/ansible/roles/aws/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/aws/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/aws/tasks/ubuntu_bionic.yaml b/fdio.infra.ansible/roles/aws/tasks/ubuntu_bionic.yaml
index bca1cf5095..bca1cf5095 100644
--- a/resources/tools/testbed-setup/ansible/roles/aws/tasks/ubuntu_bionic.yaml
+++ b/fdio.infra.ansible/roles/aws/tasks/ubuntu_bionic.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/aws/tasks/ubuntu_focal.yaml b/fdio.infra.ansible/roles/aws/tasks/ubuntu_focal.yaml
index a8cc56c0c4..a8cc56c0c4 100644
--- a/resources/tools/testbed-setup/ansible/roles/aws/tasks/ubuntu_focal.yaml
+++ b/fdio.infra.ansible/roles/aws/tasks/ubuntu_focal.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/azure/defaults/main.yaml b/fdio.infra.ansible/roles/azure/defaults/main.yaml
index 8c48c307bc..8c48c307bc 100644
--- a/resources/tools/testbed-setup/ansible/roles/azure/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/azure/defaults/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/azure/files/10-dtap.link b/fdio.infra.ansible/roles/azure/files/10-dtap.link
index a8e0aa10f3..a8e0aa10f3 100644
--- a/resources/tools/testbed-setup/ansible/roles/azure/files/10-dtap.link
+++ b/fdio.infra.ansible/roles/azure/files/10-dtap.link
diff --git a/resources/tools/testbed-setup/ansible/roles/azure/handlers/main.yaml b/fdio.infra.ansible/roles/azure/handlers/main.yaml
index f0d46062d9..f0d46062d9 100644
--- a/resources/tools/testbed-setup/ansible/roles/azure/handlers/main.yaml
+++ b/fdio.infra.ansible/roles/azure/handlers/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/azure/tasks/main.yaml b/fdio.infra.ansible/roles/azure/tasks/main.yaml
index c8d72475d8..c8d72475d8 100644
--- a/resources/tools/testbed-setup/ansible/roles/azure/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/azure/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/baremetal/handlers/cimc.yaml b/fdio.infra.ansible/roles/baremetal/handlers/cimc.yaml
index 0048d19032..0048d19032 100644
--- a/resources/tools/testbed-setup/ansible/roles/baremetal/handlers/cimc.yaml
+++ b/fdio.infra.ansible/roles/baremetal/handlers/cimc.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/baremetal/handlers/ipmi.yaml b/fdio.infra.ansible/roles/baremetal/handlers/ipmi.yaml
index 239b8973f7..239b8973f7 100644
--- a/resources/tools/testbed-setup/ansible/roles/baremetal/handlers/ipmi.yaml
+++ b/fdio.infra.ansible/roles/baremetal/handlers/ipmi.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/baremetal/handlers/main.yaml b/fdio.infra.ansible/roles/baremetal/handlers/main.yaml
index d8dabeb222..d8dabeb222 100644
--- a/resources/tools/testbed-setup/ansible/roles/baremetal/handlers/main.yaml
+++ b/fdio.infra.ansible/roles/baremetal/handlers/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/cadvisor/defaults/main.yaml b/fdio.infra.ansible/roles/cadvisor/defaults/main.yaml
index 3b25e551ea..3b25e551ea 100644
--- a/resources/tools/testbed-setup/ansible/roles/cadvisor/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/cadvisor/defaults/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/cadvisor/tasks/main.yaml b/fdio.infra.ansible/roles/cadvisor/tasks/main.yaml
index a2a13368c2..a2a13368c2 100644
--- a/resources/tools/testbed-setup/ansible/roles/cadvisor/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/cadvisor/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml b/fdio.infra.ansible/roles/calibration/defaults/main.yaml
index 020c0119b1..020c0119b1 100644
--- a/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/calibration/defaults/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/aarch64.yaml b/fdio.infra.ansible/roles/calibration/tasks/aarch64.yaml
index ca4e75d268..ca4e75d268 100644
--- a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/aarch64.yaml
+++ b/fdio.infra.ansible/roles/calibration/tasks/aarch64.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml b/fdio.infra.ansible/roles/calibration/tasks/main.yaml
index 696f1c9265..696f1c9265 100644
--- a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/calibration/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/x86_64.yaml b/fdio.infra.ansible/roles/calibration/tasks/x86_64.yaml
index 90b1c954b5..90b1c954b5 100644
--- a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/x86_64.yaml
+++ b/fdio.infra.ansible/roles/calibration/tasks/x86_64.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/cleanup/files/reset_vppdevice.sh b/fdio.infra.ansible/roles/cleanup/files/reset_vppdevice.sh
index ede2db1273..ede2db1273 100644
--- a/resources/tools/testbed-setup/ansible/roles/cleanup/files/reset_vppdevice.sh
+++ b/fdio.infra.ansible/roles/cleanup/files/reset_vppdevice.sh
diff --git a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/clean_images.yaml b/fdio.infra.ansible/roles/cleanup/tasks/clean_images.yaml
index e030acbff2..e030acbff2 100644
--- a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/clean_images.yaml
+++ b/fdio.infra.ansible/roles/cleanup/tasks/clean_images.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/kill_containers.yaml b/fdio.infra.ansible/roles/cleanup/tasks/kill_containers.yaml
index 25fd48e420..25fd48e420 100644
--- a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/kill_containers.yaml
+++ b/fdio.infra.ansible/roles/cleanup/tasks/kill_containers.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/kill_process.yaml b/fdio.infra.ansible/roles/cleanup/tasks/kill_process.yaml
index c7cee37485..c7cee37485 100644
--- a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/kill_process.yaml
+++ b/fdio.infra.ansible/roles/cleanup/tasks/kill_process.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/main.yaml b/fdio.infra.ansible/roles/cleanup/tasks/main.yaml
index eeda0139b3..eeda0139b3 100644
--- a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/cleanup/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/nomad.yaml b/fdio.infra.ansible/roles/cleanup/tasks/nomad.yaml
index 3c5bf6462d..3c5bf6462d 100644
--- a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/nomad.yaml
+++ b/fdio.infra.ansible/roles/cleanup/tasks/nomad.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/remove_package.yaml b/fdio.infra.ansible/roles/cleanup/tasks/remove_package.yaml
index 302b43c99a..302b43c99a 100644
--- a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/remove_package.yaml
+++ b/fdio.infra.ansible/roles/cleanup/tasks/remove_package.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/sut.yaml b/fdio.infra.ansible/roles/cleanup/tasks/sut.yaml
index d80a35b1cb..d80a35b1cb 100644
--- a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/sut.yaml
+++ b/fdio.infra.ansible/roles/cleanup/tasks/sut.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/tg.yaml b/fdio.infra.ansible/roles/cleanup/tasks/tg.yaml
index fa2d2d2819..fa2d2d2819 100644
--- a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/tg.yaml
+++ b/fdio.infra.ansible/roles/cleanup/tasks/tg.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/vpp_device.yaml b/fdio.infra.ansible/roles/cleanup/tasks/vpp_device.yaml
index 41c4b29d37..41c4b29d37 100644
--- a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/vpp_device.yaml
+++ b/fdio.infra.ansible/roles/cleanup/tasks/vpp_device.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml b/fdio.infra.ansible/roles/common/defaults/main.yaml
index 43e40ebdf6..43e40ebdf6 100644
--- a/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/common/defaults/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/common/handlers/main.yaml b/fdio.infra.ansible/roles/common/handlers/main.yaml
index bb317e8067..bb317e8067 100644
--- a/resources/tools/testbed-setup/ansible/roles/common/handlers/main.yaml
+++ b/fdio.infra.ansible/roles/common/handlers/main.yaml
diff --git a/fdio.infra.ansible/roles/common/tasks/main.yaml b/fdio.infra.ansible/roles/common/tasks/main.yaml
new file mode 100644
index 0000000000..60b49842d2
--- /dev/null
+++ b/fdio.infra.ansible/roles/common/tasks/main.yaml
@@ -0,0 +1,55 @@
+---
+# file: roles/common/tasks/main.yaml
+
+- name: Conf - Add permanent proxy settings
+  lineinfile:
+    path: "/etc/environment"
+    state: "present"
+    line: "{{ item.key }}={{ item.value }}"
+  with_dict: "{{ proxy_env }}"
+  when: proxy_env is defined
+  tags:
+    - common-conf-proxy
+
+- name: Inst - Update package cache (apt)
+  apt:
+    update_cache: yes
+    cache_valid_time: 3600
+  when:
+    - ansible_distribution|lower == 'ubuntu'
+  tags:
+    - common-inst-prerequisites
+
+- name: Inst - Prerequisites
+  package:
+    name: "{{ packages | flatten(levels=1) }}"
+    state: latest
+  tags:
+    - common-inst-prerequisites
+
+- name: Inst - Meson (DPDK)
+  pip:
+    name:
+      - "meson==0.47.1"
+  tags:
+    - common-inst-meson
+
+- name: Conf - sudoers admin
+  lineinfile:
+    path: "/etc/sudoers"
+    state: "present"
+    regexp: "^%admin ALL="
+    line: "%admin ALL=(ALL) ALL"
+    validate: "/usr/sbin/visudo -cf %s"
+  tags:
+    - common-conf-sudoers
+
+- name: Conf - sudoers nopasswd
+  lineinfile:
+    path: "/etc/sudoers"
+    state: "present"
+    regexp: "^%sudo"
+    line: "%sudo ALL=(ALL:ALL) NOPASSWD: ALL"
+    validate: "/usr/sbin/visudo -cf %s"
+  tags:
+    - common-conf-sudoers
diff --git a/resources/tools/testbed-setup/ansible/roles/consul/defaults/main.yaml b/fdio.infra.ansible/roles/consul/defaults/main.yaml
index 786554eb58..786554eb58 100644
--- a/resources/tools/testbed-setup/ansible/roles/consul/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/consul/defaults/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/consul/handlers/main.yaml b/fdio.infra.ansible/roles/consul/handlers/main.yaml
index 338baea74e..338baea74e 100644
--- a/resources/tools/testbed-setup/ansible/roles/consul/handlers/main.yaml
+++ b/fdio.infra.ansible/roles/consul/handlers/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/consul/meta/main.yaml b/fdio.infra.ansible/roles/consul/meta/main.yaml
index 4ada8efad6..4ada8efad6 100644
--- a/resources/tools/testbed-setup/ansible/roles/consul/meta/main.yaml
+++ b/fdio.infra.ansible/roles/consul/meta/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/consul/tasks/main.yaml b/fdio.infra.ansible/roles/consul/tasks/main.yaml
index 99ac52da44..99ac52da44 100644
--- a/resources/tools/testbed-setup/ansible/roles/consul/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/consul/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/consul/templates/base.hcl.j2 b/fdio.infra.ansible/roles/consul/templates/base.hcl.j2
index 536c48d847..536c48d847 100644
--- a/resources/tools/testbed-setup/ansible/roles/consul/templates/base.hcl.j2
+++ b/fdio.infra.ansible/roles/consul/templates/base.hcl.j2
diff --git a/resources/tools/testbed-setup/ansible/roles/consul/templates/consul.hcl.j2 b/fdio.infra.ansible/roles/consul/templates/consul.hcl.j2
index c78e5e1ce5..c78e5e1ce5 100644
--- a/resources/tools/testbed-setup/ansible/roles/consul/templates/consul.hcl.j2
+++ b/fdio.infra.ansible/roles/consul/templates/consul.hcl.j2
diff --git a/resources/tools/testbed-setup/ansible/roles/consul/templates/consul_systemd.service.j2 b/fdio.infra.ansible/roles/consul/templates/consul_systemd.service.j2
index 8e1ef1310d..8e1ef1310d 100644
--- a/resources/tools/testbed-setup/ansible/roles/consul/templates/consul_systemd.service.j2
+++ b/fdio.infra.ansible/roles/consul/templates/consul_systemd.service.j2
diff --git a/resources/tools/testbed-setup/ansible/roles/consul/templates/ports.hcl.j2 b/fdio.infra.ansible/roles/consul/templates/ports.hcl.j2
index a658060ce8..a658060ce8 100644
--- a/resources/tools/testbed-setup/ansible/roles/consul/templates/ports.hcl.j2
+++ b/fdio.infra.ansible/roles/consul/templates/ports.hcl.j2
diff --git a/resources/tools/testbed-setup/ansible/roles/consul/templates/services.json.j2 b/fdio.infra.ansible/roles/consul/templates/services.json.j2
index 3245ba92a4..3245ba92a4 100644
--- a/resources/tools/testbed-setup/ansible/roles/consul/templates/services.json.j2
+++ b/fdio.infra.ansible/roles/consul/templates/services.json.j2
diff --git a/resources/tools/testbed-setup/ansible/roles/consul/templates/telemetry.hcl.j2 b/fdio.infra.ansible/roles/consul/templates/telemetry.hcl.j2
index ec7fabc9da..ec7fabc9da 100644
--- a/resources/tools/testbed-setup/ansible/roles/consul/templates/telemetry.hcl.j2
+++ b/fdio.infra.ansible/roles/consul/templates/telemetry.hcl.j2
diff --git a/resources/tools/testbed-setup/ansible/roles/consul/vars/main.yaml b/fdio.infra.ansible/roles/consul/vars/main.yaml
index b46333a7a7..b46333a7a7 100644
--- a/resources/tools/testbed-setup/ansible/roles/consul/vars/main.yaml
+++ b/fdio.infra.ansible/roles/consul/vars/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/Dockerfile b/fdio.infra.ansible/roles/csit_sut_image/files/Dockerfile
index 73ff5c5e86..73ff5c5e86 100644
--- a/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/Dockerfile
+++ b/fdio.infra.ansible/roles/csit_sut_image/files/Dockerfile
diff --git a/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/supervisord.conf b/fdio.infra.ansible/roles/csit_sut_image/files/supervisord.conf
index 22a36be5c6..22a36be5c6 100644
--- a/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/supervisord.conf
+++ b/fdio.infra.ansible/roles/csit_sut_image/files/supervisord.conf
diff --git a/resources/tools/testbed-setup/ansible/roles/csit_sut_image/tasks/main.yaml b/fdio.infra.ansible/roles/csit_sut_image/tasks/main.yaml
index 2affe4b18e..2affe4b18e 100644
--- a/resources/tools/testbed-setup/ansible/roles/csit_sut_image/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/csit_sut_image/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/docker/defaults/main.yaml b/fdio.infra.ansible/roles/docker/defaults/main.yaml
index 8343558238..8343558238 100644
--- a/resources/tools/testbed-setup/ansible/roles/docker/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/docker/defaults/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/docker/handlers/main.yaml b/fdio.infra.ansible/roles/docker/handlers/main.yaml
index d89adb9a1a..d89adb9a1a 100644
--- a/resources/tools/testbed-setup/ansible/roles/docker/handlers/main.yaml
+++ b/fdio.infra.ansible/roles/docker/handlers/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/docker/meta/main.yaml b/fdio.infra.ansible/roles/docker/meta/main.yaml
index ab3d197791..ab3d197791 100644
--- a/resources/tools/testbed-setup/ansible/roles/docker/meta/main.yaml
+++ b/fdio.infra.ansible/roles/docker/meta/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/docker/tasks/main.yaml b/fdio.infra.ansible/roles/docker/tasks/main.yaml
index 5a96b7a7c5..5a96b7a7c5 100644
--- a/resources/tools/testbed-setup/ansible/roles/docker/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/docker/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/docker/tasks/ubuntu_bionic.yaml b/fdio.infra.ansible/roles/docker/tasks/ubuntu_bionic.yaml
index 8bda4fed21..8bda4fed21 100644
--- a/resources/tools/testbed-setup/ansible/roles/docker/tasks/ubuntu_bionic.yaml
+++ b/fdio.infra.ansible/roles/docker/tasks/ubuntu_bionic.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/docker/tasks/ubuntu_focal.yaml b/fdio.infra.ansible/roles/docker/tasks/ubuntu_focal.yaml
index 84bd1c5824..84bd1c5824 100644
--- a/resources/tools/testbed-setup/ansible/roles/docker/tasks/ubuntu_focal.yaml
+++ b/fdio.infra.ansible/roles/docker/tasks/ubuntu_focal.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/docker/templates/daemon.json.j2 b/fdio.infra.ansible/roles/docker/templates/daemon.json.j2
index becc2b1af7..becc2b1af7 100644
--- a/resources/tools/testbed-setup/ansible/roles/docker/templates/daemon.json.j2
+++ b/fdio.infra.ansible/roles/docker/templates/daemon.json.j2
diff --git a/resources/tools/testbed-setup/ansible/roles/docker/templates/docker.service.proxy.http b/fdio.infra.ansible/roles/docker/templates/docker.service.proxy.http
index 73ceba3870..73ceba3870 100644
--- a/resources/tools/testbed-setup/ansible/roles/docker/templates/docker.service.proxy.http
+++ b/fdio.infra.ansible/roles/docker/templates/docker.service.proxy.http
diff --git a/resources/tools/testbed-setup/ansible/roles/docker/templates/docker.service.proxy.https b/fdio.infra.ansible/roles/docker/templates/docker.service.proxy.https
index 1c2097eb9d..1c2097eb9d 100644
--- a/resources/tools/testbed-setup/ansible/roles/docker/templates/docker.service.proxy.https
+++ b/fdio.infra.ansible/roles/docker/templates/docker.service.proxy.https
diff --git a/resources/tools/testbed-setup/ansible/roles/dpdk/defaults/main.yaml b/fdio.infra.ansible/roles/dpdk/defaults/main.yaml
index 2a8c691728..2a8c691728 100644
--- a/resources/tools/testbed-setup/ansible/roles/dpdk/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/dpdk/defaults/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/dpdk/files/dpdk-mlx5.patch b/fdio.infra.ansible/roles/dpdk/files/dpdk-mlx5.patch
index a3928d70f7..a3928d70f7 100644
--- a/resources/tools/testbed-setup/ansible/roles/dpdk/files/dpdk-mlx5.patch
+++ b/fdio.infra.ansible/roles/dpdk/files/dpdk-mlx5.patch
diff --git a/resources/tools/testbed-setup/ansible/roles/dpdk/tasks/main.yaml b/fdio.infra.ansible/roles/dpdk/tasks/main.yaml
index 46f942be93..46f942be93 100644
--- a/resources/tools/testbed-setup/ansible/roles/dpdk/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/dpdk/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/iperf/defaults/main.yaml b/fdio.infra.ansible/roles/iperf/defaults/main.yaml
index 07af60b63a..07af60b63a 100644
--- a/resources/tools/testbed-setup/ansible/roles/iperf/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/iperf/defaults/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/iperf/tasks/main.yaml b/fdio.infra.ansible/roles/iperf/tasks/main.yaml
index f8948cae57..f8948cae57 100644
--- a/resources/tools/testbed-setup/ansible/roles/iperf/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/iperf/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/jenkins_job_health_exporter/defaults/main.yaml b/fdio.infra.ansible/roles/jenkins_job_health_exporter/defaults/main.yaml
index 9813d41afb..9813d41afb 100644
--- a/resources/tools/testbed-setup/ansible/roles/jenkins_job_health_exporter/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/jenkins_job_health_exporter/defaults/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/jenkins_job_health_exporter/handlers/main.yaml b/fdio.infra.ansible/roles/jenkins_job_health_exporter/handlers/main.yaml
index 29fee98fed..29fee98fed 100644
--- a/resources/tools/testbed-setup/ansible/roles/jenkins_job_health_exporter/handlers/main.yaml
+++ b/fdio.infra.ansible/roles/jenkins_job_health_exporter/handlers/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/jenkins_job_health_exporter/tasks/main.yaml b/fdio.infra.ansible/roles/jenkins_job_health_exporter/tasks/main.yaml
index 5dbe476019..5dbe476019 100644
--- a/resources/tools/testbed-setup/ansible/roles/jenkins_job_health_exporter/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/jenkins_job_health_exporter/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/jenkins_job_health_exporter/templates/jenkins-job-health-exporter.j2 b/fdio.infra.ansible/roles/jenkins_job_health_exporter/templates/jenkins-job-health-exporter.j2
index 5942b782e0..5942b782e0 100644
--- a/resources/tools/testbed-setup/ansible/roles/jenkins_job_health_exporter/templates/jenkins-job-health-exporter.j2
+++ b/fdio.infra.ansible/roles/jenkins_job_health_exporter/templates/jenkins-job-health-exporter.j2
diff --git a/resources/tools/testbed-setup/ansible/roles/jenkins_job_health_exporter/templates/jenkins-job-health-exporter.service.j2 b/fdio.infra.ansible/roles/jenkins_job_health_exporter/templates/jenkins-job-health-exporter.service.j2
index 38073d0a8c..38073d0a8c 100644
--- a/resources/tools/testbed-setup/ansible/roles/jenkins_job_health_exporter/templates/jenkins-job-health-exporter.service.j2
+++ b/fdio.infra.ansible/roles/jenkins_job_health_exporter/templates/jenkins-job-health-exporter.service.j2
diff --git a/resources/tools/testbed-setup/ansible/roles/kernel/defaults/main.yaml b/fdio.infra.ansible/roles/kernel/defaults/main.yaml
index b9b4253622..b9b4253622 100644
--- a/resources/tools/testbed-setup/ansible/roles/kernel/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/kernel/defaults/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/kernel/filter_plugins/main.py b/fdio.infra.ansible/roles/kernel/filter_plugins/main.py
index 7d909b90e8..7d909b90e8 100644
--- a/resources/tools/testbed-setup/ansible/roles/kernel/filter_plugins/main.py
+++ b/fdio.infra.ansible/roles/kernel/filter_plugins/main.py
diff --git a/resources/tools/testbed-setup/ansible/roles/kernel/handlers/main.yaml b/fdio.infra.ansible/roles/kernel/handlers/main.yaml
index 963fd71756..963fd71756 100644
--- a/resources/tools/testbed-setup/ansible/roles/kernel/handlers/main.yaml
+++ b/fdio.infra.ansible/roles/kernel/handlers/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/kernel/tasks/main.yaml b/fdio.infra.ansible/roles/kernel/tasks/main.yaml
index 431e344fb8..431e344fb8 100644
--- a/resources/tools/testbed-setup/ansible/roles/kernel/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/kernel/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/kernel/tasks/ubuntu_bionic.yaml b/fdio.infra.ansible/roles/kernel/tasks/ubuntu_bionic.yaml
index 349c853c11..349c853c11 100644
--- a/resources/tools/testbed-setup/ansible/roles/kernel/tasks/ubuntu_bionic.yaml
+++ b/fdio.infra.ansible/roles/kernel/tasks/ubuntu_bionic.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/kernel/tasks/ubuntu_focal.yaml b/fdio.infra.ansible/roles/kernel/tasks/ubuntu_focal.yaml
index 9cbc4d4787..9cbc4d4787 100644
--- a/resources/tools/testbed-setup/ansible/roles/kernel/tasks/ubuntu_focal.yaml
+++ b/fdio.infra.ansible/roles/kernel/tasks/ubuntu_focal.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/kernel_vm/files/initramfs_modules b/fdio.infra.ansible/roles/kernel_vm/files/initramfs_modules
index 00ae8e03e7..00ae8e03e7 100644
--- a/resources/tools/testbed-setup/ansible/roles/kernel_vm/files/initramfs_modules
+++ b/fdio.infra.ansible/roles/kernel_vm/files/initramfs_modules
diff --git a/resources/tools/testbed-setup/ansible/roles/kernel_vm/files/initramfs_resume b/fdio.infra.ansible/roles/kernel_vm/files/initramfs_resume
index 820819823b..820819823b 100644
--- a/resources/tools/testbed-setup/ansible/roles/kernel_vm/files/initramfs_resume
+++ b/fdio.infra.ansible/roles/kernel_vm/files/initramfs_resume
diff --git a/resources/tools/testbed-setup/ansible/roles/kernel_vm/tasks/main.yaml b/fdio.infra.ansible/roles/kernel_vm/tasks/main.yaml
index 4d1b306e64..4d1b306e64 100644
--- a/resources/tools/testbed-setup/ansible/roles/kernel_vm/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/kernel_vm/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/kubernetes/defaults/main.yaml b/fdio.infra.ansible/roles/kubernetes/defaults/main.yaml
index 1a2f773950..1a2f773950 100644
--- a/resources/tools/testbed-setup/ansible/roles/kubernetes/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/kubernetes/defaults/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/kubernetes/tasks/main.yaml b/fdio.infra.ansible/roles/kubernetes/tasks/main.yaml
index 160ffb8c06..160ffb8c06 100644
--- a/resources/tools/testbed-setup/ansible/roles/kubernetes/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/kubernetes/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/kubernetes/tasks/ubuntu_bionic.yaml b/fdio.infra.ansible/roles/kubernetes/tasks/ubuntu_bionic.yaml
index 454e80e002..454e80e002 100644
--- a/resources/tools/testbed-setup/ansible/roles/kubernetes/tasks/ubuntu_bionic.yaml
+++ b/fdio.infra.ansible/roles/kubernetes/tasks/ubuntu_bionic.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/mellanox/defaults/main.yaml b/fdio.infra.ansible/roles/mellanox/defaults/main.yaml
index 0961ec7df6..0961ec7df6 100644
--- a/resources/tools/testbed-setup/ansible/roles/mellanox/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/mellanox/defaults/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/mellanox/tasks/main.yaml b/fdio.infra.ansible/roles/mellanox/tasks/main.yaml
index 670282923a..670282923a 100644
--- a/resources/tools/testbed-setup/ansible/roles/mellanox/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/mellanox/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/nomad/defaults/main.yaml b/fdio.infra.ansible/roles/nomad/defaults/main.yaml
index 864890c11e..864890c11e 100644
--- a/resources/tools/testbed-setup/ansible/roles/nomad/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/nomad/defaults/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/nomad/handlers/main.yaml b/fdio.infra.ansible/roles/nomad/handlers/main.yaml
index f0bcee9142..f0bcee9142 100644
--- a/resources/tools/testbed-setup/ansible/roles/nomad/handlers/main.yaml
+++ b/fdio.infra.ansible/roles/nomad/handlers/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/nomad/meta/main.yaml b/fdio.infra.ansible/roles/nomad/meta/main.yaml
index 9fc40d9ae1..9fc40d9ae1 100644
--- a/resources/tools/testbed-setup/ansible/roles/nomad/meta/main.yaml
+++ b/fdio.infra.ansible/roles/nomad/meta/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/nomad/tasks/main.yaml b/fdio.infra.ansible/roles/nomad/tasks/main.yaml
index 54e80513b8..54e80513b8 100644
--- a/resources/tools/testbed-setup/ansible/roles/nomad/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/nomad/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/nomad/templates/base.hcl.j2 b/fdio.infra.ansible/roles/nomad/templates/base.hcl.j2
index 7badecf9e0..7badecf9e0 100644
--- a/resources/tools/testbed-setup/ansible/roles/nomad/templates/base.hcl.j2
+++ b/fdio.infra.ansible/roles/nomad/templates/base.hcl.j2
diff --git a/resources/tools/testbed-setup/ansible/roles/nomad/templates/client.hcl.j2 b/fdio.infra.ansible/roles/nomad/templates/client.hcl.j2
index f245697a22..f245697a22 100644
--- a/resources/tools/testbed-setup/ansible/roles/nomad/templates/client.hcl.j2
+++ b/fdio.infra.ansible/roles/nomad/templates/client.hcl.j2
diff --git a/resources/tools/testbed-setup/ansible/roles/nomad/templates/custom.hcl.j2 b/fdio.infra.ansible/roles/nomad/templates/custom.hcl.j2
index 37ff6f3496..37ff6f3496 100644
--- a/resources/tools/testbed-setup/ansible/roles/nomad/templates/custom.hcl.j2
+++ b/fdio.infra.ansible/roles/nomad/templates/custom.hcl.j2
diff --git a/resources/tools/testbed-setup/ansible/roles/nomad/templates/nomad_systemd.service.j2 b/fdio.infra.ansible/roles/nomad/templates/nomad_systemd.service.j2
index 2a87c65063..2a87c65063 100644
--- a/resources/tools/testbed-setup/ansible/roles/nomad/templates/nomad_systemd.service.j2
+++ b/fdio.infra.ansible/roles/nomad/templates/nomad_systemd.service.j2
diff --git a/resources/tools/testbed-setup/ansible/roles/nomad/templates/server.hcl.j2 b/fdio.infra.ansible/roles/nomad/templates/server.hcl.j2
index b581de9ad0..b581de9ad0 100644
--- a/resources/tools/testbed-setup/ansible/roles/nomad/templates/server.hcl.j2
+++ b/fdio.infra.ansible/roles/nomad/templates/server.hcl.j2
diff --git a/resources/tools/testbed-setup/ansible/roles/nomad/templates/telemetry.hcl.j2 b/fdio.infra.ansible/roles/nomad/templates/telemetry.hcl.j2
index 256c6999e9..256c6999e9 100644
--- a/resources/tools/testbed-setup/ansible/roles/nomad/templates/telemetry.hcl.j2
+++ b/fdio.infra.ansible/roles/nomad/templates/telemetry.hcl.j2
diff --git a/resources/tools/testbed-setup/ansible/roles/nomad/templates/tls.hcl.j2 b/fdio.infra.ansible/roles/nomad/templates/tls.hcl.j2
index 650765f1b1..650765f1b1 100644
--- a/resources/tools/testbed-setup/ansible/roles/nomad/templates/tls.hcl.j2
+++ b/fdio.infra.ansible/roles/nomad/templates/tls.hcl.j2
diff --git a/resources/tools/testbed-setup/ansible/roles/nomad/vars/main.yaml b/fdio.infra.ansible/roles/nomad/vars/main.yaml
index a72222c992..a72222c992 100644
--- a/resources/tools/testbed-setup/ansible/roles/nomad/vars/main.yaml
+++ b/fdio.infra.ansible/roles/nomad/vars/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/performance_tuning/defaults/main.yaml b/fdio.infra.ansible/roles/performance_tuning/defaults/main.yaml
index 2dad931e92..2dad931e92 100644
--- a/resources/tools/testbed-setup/ansible/roles/performance_tuning/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/performance_tuning/defaults/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/performance_tuning/files/cpufrequtils b/fdio.infra.ansible/roles/performance_tuning/files/cpufrequtils
index 03070fefe1..03070fefe1 100644
--- a/resources/tools/testbed-setup/ansible/roles/performance_tuning/files/cpufrequtils
+++ b/fdio.infra.ansible/roles/performance_tuning/files/cpufrequtils
diff --git a/resources/tools/testbed-setup/ansible/roles/performance_tuning/files/disable-turbo-boost.service b/fdio.infra.ansible/roles/performance_tuning/files/disable-turbo-boost.service
index e04729de50..e04729de50 100644
--- a/resources/tools/testbed-setup/ansible/roles/performance_tuning/files/disable-turbo-boost.service
+++ b/fdio.infra.ansible/roles/performance_tuning/files/disable-turbo-boost.service
diff --git a/resources/tools/testbed-setup/ansible/roles/performance_tuning/files/irqbalance b/fdio.infra.ansible/roles/performance_tuning/files/irqbalance
index 861be02fb3..861be02fb3 100644
--- a/resources/tools/testbed-setup/ansible/roles/performance_tuning/files/irqbalance
+++ b/fdio.infra.ansible/roles/performance_tuning/files/irqbalance
diff --git a/resources/tools/testbed-setup/ansible/roles/performance_tuning/filter_plugins/main.py b/fdio.infra.ansible/roles/performance_tuning/filter_plugins/main.py
index d76f6fe166..d76f6fe166 100644
--- a/resources/tools/testbed-setup/ansible/roles/performance_tuning/filter_plugins/main.py
+++ b/fdio.infra.ansible/roles/performance_tuning/filter_plugins/main.py
diff --git a/resources/tools/testbed-setup/ansible/roles/performance_tuning/handlers/main.yaml b/fdio.infra.ansible/roles/performance_tuning/handlers/main.yaml
index fa2876b7ac..fa2876b7ac 100644
--- a/resources/tools/testbed-setup/ansible/roles/performance_tuning/handlers/main.yaml
+++ b/fdio.infra.ansible/roles/performance_tuning/handlers/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml b/fdio.infra.ansible/roles/performance_tuning/tasks/main.yaml
index e9cdd0d819..e9cdd0d819 100644
--- a/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/performance_tuning/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/turbo_boost.yaml b/fdio.infra.ansible/roles/performance_tuning/tasks/turbo_boost.yaml
index 7f69365a2d..7f69365a2d 100644
--- a/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/turbo_boost.yaml
+++ b/fdio.infra.ansible/roles/performance_tuning/tasks/turbo_boost.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/prometheus_exporter/defaults/main.yaml b/fdio.infra.ansible/roles/prometheus_exporter/defaults/main.yaml
index eb2b94cb26..eb2b94cb26 100644
--- a/resources/tools/testbed-setup/ansible/roles/prometheus_exporter/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/prometheus_exporter/defaults/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/prometheus_exporter/files/blackbox.yml b/fdio.infra.ansible/roles/prometheus_exporter/files/blackbox.yml
index f61c26e1a8..f61c26e1a8 100644
--- a/resources/tools/testbed-setup/ansible/roles/prometheus_exporter/files/blackbox.yml
+++ b/fdio.infra.ansible/roles/prometheus_exporter/files/blackbox.yml
diff --git a/resources/tools/testbed-setup/ansible/roles/prometheus_exporter/handlers/main.yaml b/fdio.infra.ansible/roles/prometheus_exporter/handlers/main.yaml
index 9c374eaa61..9c374eaa61 100644
--- a/resources/tools/testbed-setup/ansible/roles/prometheus_exporter/handlers/main.yaml
+++ b/fdio.infra.ansible/roles/prometheus_exporter/handlers/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/prometheus_exporter/tasks/main.yaml b/fdio.infra.ansible/roles/prometheus_exporter/tasks/main.yaml
index b38215c4a2..b38215c4a2 100644
--- a/resources/tools/testbed-setup/ansible/roles/prometheus_exporter/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/prometheus_exporter/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/prometheus_exporter/tasks/ubuntu_bionic.yaml b/fdio.infra.ansible/roles/prometheus_exporter/tasks/ubuntu_bionic.yaml
index 566753e272..566753e272 100644
--- a/resources/tools/testbed-setup/ansible/roles/prometheus_exporter/tasks/ubuntu_bionic.yaml
+++ b/fdio.infra.ansible/roles/prometheus_exporter/tasks/ubuntu_bionic.yaml
diff --git a/fdio.infra.ansible/roles/python_env/defaults/main.yaml b/fdio.infra.ansible/roles/python_env/defaults/main.yaml
new file mode 100644
index 0000000000..342d1c3d33
--- /dev/null
+++ b/fdio.infra.ansible/roles/python_env/defaults/main.yaml
@@ -0,0 +1,41 @@
+---
+# file: roles/common/defaults/main.yaml
+
+packages: "{{ packages_base + packages_by_distro[ansible_distribution|lower][ansible_distribution_release] + packages_by_arch[ansible_machine] }}"
+
+packages_base:
+  - "virtualenv"
+
+packages_by_distro:
+  ubuntu:
+    bionic:
+      - "python-all"
+      - "python-apt"
+      - "python-cffi"
+      - "python-cffi-backend"
+      - "python-dev"
+      - "python-pip"
+      - "python-setuptools"
+      - "python3-all"
+      - "python3-apt"
+      - "python3-cffi"
+      - "python3-cffi-backend"
+      - "python3-dev"
+      - "python3-pip"
+      - "python3-pyelftools"
+      - "python3-setuptools"
+    focal:
+      - "python3-all"
+      - "python3-apt"
+      - "python3-cffi"
+      - "python3-cffi-backend"
+      - "python3-dev"
+      - "python3-pip"
+      - "python3-pyelftools"
+      - "python3-setuptools"
+
+packages_by_arch:
+  aarch64:
+    - []
+  x86_64:
+    - []
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml b/fdio.infra.ansible/roles/python_env/tasks/main.yaml
index 91fcd188a6..cddfe63655 100644
--- a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/python_env/tasks/main.yaml
@@ -1,15 +1,5 @@
 ---
-# file: roles/common/tasks/main.yaml
-
-- name: Conf - Add permanent proxy settings
-  lineinfile:
-    path: "/etc/environment"
-    state: "present"
-    line: "{{ item.key }}={{ item.value }}"
-  with_dict: "{{ proxy_env }}"
-  when: proxy_env is defined
-  tags:
-    - common-conf-proxy
+# file: roles/python_env/tasks/main.yaml
 
 - name: Inst - Update package cache (apt)
   apt:
@@ -40,7 +30,7 @@
       - "scapy==2.4.3"
       - "scp==0.13.2"
       - "ansible==2.10.7"
-      - "dill==0.2.8.2"
+      - "dill==0.3.3"
       - "numpy==1.17.3"
       - "hdrhistogram==0.6.1"
       - "plotly==4.1.1"
@@ -90,32 +80,3 @@
       - "scipy==1.5.4"
   tags:
     - common-inst-pip
-
-- name: Inst - Meson (DPDK)
-  pip:
-    name:
-      - "meson==0.47.1"
-  tags:
-    - common-inst-meson
-
-- name: Conf - sudoers admin
-  lineinfile:
-    path: "/etc/sudoers"
-    state: "present"
-    regexp: "^%admin ALL="
-    line: "%admin ALL=(ALL) ALL"
-    validate: "/usr/sbin/visudo -cf %s"
-  tags:
-    - common-conf-sudoers
-
-- name: Conf - sudoers nopasswd
-  lineinfile:
-    path: "/etc/sudoers"
-    state: "present"
-    regexp: "^%sudo"
-    line: "%sudo ALL=(ALL:ALL) NOPASSWD: ALL"
-    validate: "/usr/sbin/visudo -cf %s"
-  tags:
-    - common-conf-sudoers
-
-- meta: flush_handlers
diff --git a/resources/tools/testbed-setup/ansible/roles/tg/files/csit-initialize-docker-tg.service b/fdio.infra.ansible/roles/tg/files/csit-initialize-docker-tg.service
index 11911201d5..11911201d5 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg/files/csit-initialize-docker-tg.service
+++ b/fdio.infra.ansible/roles/tg/files/csit-initialize-docker-tg.service
diff --git a/resources/tools/testbed-setup/ansible/roles/tg/files/csit-initialize-docker-tg.sh b/fdio.infra.ansible/roles/tg/files/csit-initialize-docker-tg.sh
index 1192feeee9..0120795e9c 100755
--- a/resources/tools/testbed-setup/ansible/roles/tg/files/csit-initialize-docker-tg.sh
+++ b/fdio.infra.ansible/roles/tg/files/csit-initialize-docker-tg.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
diff --git a/resources/tools/testbed-setup/ansible/roles/tg/handlers/main.yaml b/fdio.infra.ansible/roles/tg/handlers/main.yaml
index e13e67b2c1..e13e67b2c1 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg/handlers/main.yaml
+++ b/fdio.infra.ansible/roles/tg/handlers/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml b/fdio.infra.ansible/roles/tg/tasks/main.yaml
index 4e79dabfab..4e79dabfab 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/tg/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/topology/tasks/main.yaml b/fdio.infra.ansible/roles/topology/tasks/main.yaml
index cf3eb5367f..cf3eb5367f 100644
--- a/resources/tools/testbed-setup/ansible/roles/topology/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/topology/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/templates/topology_2n_aws_c5n.j2 b/fdio.infra.ansible/roles/topology/templates/topology_2n_aws_c5n.j2
index 1d99a34994..1d99a34994 100644
--- a/resources/tools/testbed-setup/ansible/templates/topology_2n_aws_c5n.j2
+++ b/fdio.infra.ansible/roles/topology/templates/topology_2n_aws_c5n.j2
diff --git a/resources/tools/testbed-setup/ansible/templates/topology_3n_aws_c5n.j2 b/fdio.infra.ansible/roles/topology/templates/topology_3n_aws_c5n.j2
index 631b0be63b..631b0be63b 100644
--- a/resources/tools/testbed-setup/ansible/templates/topology_3n_aws_c5n.j2
+++ b/fdio.infra.ansible/roles/topology/templates/topology_3n_aws_c5n.j2
diff --git a/resources/tools/testbed-setup/ansible/templates/topology_3n_azure_Fsv2.j2 b/fdio.infra.ansible/roles/topology/templates/topology_3n_azure_Fsv2.j2
index e4dd6cdbf2..e4dd6cdbf2 100644
--- a/resources/tools/testbed-setup/ansible/templates/topology_3n_azure_Fsv2.j2
+++ b/fdio.infra.ansible/roles/topology/templates/topology_3n_azure_Fsv2.j2
diff --git a/resources/tools/testbed-setup/ansible/roles/trex/defaults/main.yaml b/fdio.infra.ansible/roles/trex/defaults/main.yaml
index 19bb15e9d3..19bb15e9d3 100644
--- a/resources/tools/testbed-setup/ansible/roles/trex/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/trex/defaults/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/trex/files/t-rex.patch b/fdio.infra.ansible/roles/trex/files/t-rex.patch
index e7db647779..e7db647779 100644
--- a/resources/tools/testbed-setup/ansible/roles/trex/files/t-rex.patch
+++ b/fdio.infra.ansible/roles/trex/files/t-rex.patch
diff --git a/resources/tools/testbed-setup/ansible/roles/trex/tasks/deploy_block.yaml b/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml
index 5a7890b071..5a7890b071 100644
--- a/resources/tools/testbed-setup/ansible/roles/trex/tasks/deploy_block.yaml
+++ b/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/trex/tasks/main.yaml b/fdio.infra.ansible/roles/trex/tasks/main.yaml
index d43baf909b..d43baf909b 100644
--- a/resources/tools/testbed-setup/ansible/roles/trex/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/trex/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/user_add/defaults/main.yaml b/fdio.infra.ansible/roles/user_add/defaults/main.yaml
index 56f5098f12..56f5098f12 100644
--- a/resources/tools/testbed-setup/ansible/roles/user_add/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/user_add/defaults/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/user_add/handlers/main.yaml b/fdio.infra.ansible/roles/user_add/handlers/main.yaml
index 960f573b48..960f573b48 100644
--- a/resources/tools/testbed-setup/ansible/roles/user_add/handlers/main.yaml
+++ b/fdio.infra.ansible/roles/user_add/handlers/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/user_add/tasks/main.yaml b/fdio.infra.ansible/roles/user_add/tasks/main.yaml
index f980aff84d..f980aff84d 100644
--- a/resources/tools/testbed-setup/ansible/roles/user_add/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/user_add/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/vpp/defaults/main.yaml b/fdio.infra.ansible/roles/vpp/defaults/main.yaml
index 7fac499307..7fac499307 100644
--- a/resources/tools/testbed-setup/ansible/roles/vpp/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/vpp/defaults/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/vpp/tasks/main.yaml b/fdio.infra.ansible/roles/vpp/tasks/main.yaml
index ef03011b51..ef03011b51 100644
--- a/resources/tools/testbed-setup/ansible/roles/vpp/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/vpp/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs-default.sh b/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-default.sh
index becc18f1a8..d0fc772037 100644
--- a/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs-default.sh
+++ b/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-default.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
diff --git a/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs-tx2.sh b/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-tx2.sh
index 6c56752ad0..6c56752ad0 100644
--- a/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs-tx2.sh
+++ b/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-tx2.sh
diff --git a/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs.service b/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs.service
index 996792ab9b..996792ab9b 100644
--- a/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs.service
+++ b/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs.service
diff --git a/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs.sh b/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs.sh
index 365497865e..393e997d65 100644
--- a/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs.sh
+++ b/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
diff --git a/resources/tools/testbed-setup/ansible/roles/vpp_device/handlers/main.yaml b/fdio.infra.ansible/roles/vpp_device/handlers/main.yaml
index ee9d368638..ee9d368638 100644
--- a/resources/tools/testbed-setup/ansible/roles/vpp_device/handlers/main.yaml
+++ b/fdio.infra.ansible/roles/vpp_device/handlers/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/vpp_device/tasks/main.yaml b/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml
index 33b551715f..33b551715f 100644
--- a/resources/tools/testbed-setup/ansible/roles/vpp_device/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml
diff --git a/resources/tools/testbed-setup/ansible/site.yaml b/fdio.infra.ansible/site.yaml
index 4436c21b18..4436c21b18 100644
--- a/resources/tools/testbed-setup/ansible/site.yaml
+++ b/fdio.infra.ansible/site.yaml
diff --git a/resources/tools/testbed-setup/ansible/sut.yaml b/fdio.infra.ansible/sut.yaml
index 37a96c28d0..2a413d7924 100644
--- a/resources/tools/testbed-setup/ansible/sut.yaml
+++ b/fdio.infra.ansible/sut.yaml
@@ -16,6 +16,8 @@
       tags: baremetal
     - role: common
       tags: common
+    - role: python_env
+      tags: python_env
     - role: kernel
       tags: kernel
     - role: mellanox
@@ -52,6 +54,8 @@
       tags: user_add
     - role: common
       tags: common
+    - role: python_env
+      tags: python_env
     - role: vpp
       tags: vpp
     - role: dpdk
@@ -81,6 +85,8 @@
       tags: user_add
     - role: common
       tags: common
+    - role: python_env
+      tags: python_env
     - role: docker
       tags: docker
     - role: vpp
@@ -93,7 +99,5 @@
       tags: azure
     - role: cleanup
       tags: cleanup
-    # TODO: 'Check Kernel Parameters' failing in
-    # resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
-    # - role: calibration
-    #   tags: calibration
+    - role: calibration
+      tags: calibration
diff --git a/resources/tools/testbed-setup/ansible/tg.yaml b/fdio.infra.ansible/tg.yaml
index 3d5137f35e..01d2cbc0ca 100644
--- a/resources/tools/testbed-setup/ansible/tg.yaml
+++ b/fdio.infra.ansible/tg.yaml
@@ -16,6 +16,8 @@
       tags: baremetal
     - role: common
       tags: common
+    - role: python_env
+      tags: python_env
     - role: kernel
       tags: kernel
     - role: mellanox
@@ -54,6 +56,8 @@
       tags: user_add
     - role: common
       tags: common
+    - role: python_env
+      tags: python_env
     - role: dpdk
       tags: dpdk
     - role: docker
@@ -87,6 +91,8 @@
       tags: user_add
     - role: common
       tags: common
+    - role: python_env
+      tags: python_env
     - role: docker
       tags: docker
     - role: tg
@@ -101,7 +107,5 @@
       tags: azure
     - role: cleanup
       tags: cleanup
-    # TODO: 'Check Kernel Parameters' failing in
-    # resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
-    # - role: calibration
-    #   tags: calibration
\ No newline at end of file
+    - role: calibration
+      tags: calibration
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/vault.yml b/fdio.infra.ansible/vault.yml
index 2c10624d07..2c10624d07 100644
--- a/resources/tools/testbed-setup/ansible/vault.yml
+++ b/fdio.infra.ansible/vault.yml
diff --git a/resources/tools/testbed-setup/ansible/vault_pass b/fdio.infra.ansible/vault_pass
index e1d46efc1f..e1d46efc1f 100644
--- a/resources/tools/testbed-setup/ansible/vault_pass
+++ b/fdio.infra.ansible/vault_pass
diff --git a/resources/tools/testbed-setup/ansible/vpp_device.yaml b/fdio.infra.ansible/vpp_device.yaml
index 2ffea31f6b..2ffea31f6b 100644
--- a/resources/tools/testbed-setup/ansible/vpp_device.yaml
+++ b/fdio.infra.ansible/vpp_device.yaml
diff --git a/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf b/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf
index 53efe6fb1d..ca974709cd 100644
--- a/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf
+++ b/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf
@@ -50,7 +50,7 @@ variable "first_run_commands" {
 variable "ansible_file_path" {
   description = "Path to Ansible playbook"
   type = string
-  default = "../../resources/tools/testbed-setup/ansible/site.yaml"
+  default = "../../fdio.infra.ansible/site.yaml"
 }
 
 variable "ansible_python_executable" {
@@ -62,7 +62,7 @@ variable "ansible_python_executable" {
 variable "ansible_topology_path" {
   description = "Path to Ansible playbook which creates a topology file"
   type = string
-  default = "../../resources/tools/testbed-setup/ansible/cloud_topology.yaml"
+  default = "../../fdio.infra.ansible/cloud_topology.yaml"
 }
 
 variable "ansible_provision_pwd" {
diff --git a/fdio.infra.terraform/2n_aws_c5n/main.tf b/fdio.infra.terraform/2n_aws_c5n/main.tf
index 7a090675e7..1aebabd3de 100644
--- a/fdio.infra.terraform/2n_aws_c5n/main.tf
+++ b/fdio.infra.terraform/2n_aws_c5n/main.tf
@@ -33,8 +33,8 @@ module "deploy" {
 
   # Ansible
   ansible_python_executable = "/usr/bin/python3"
-  ansible_file_path         = "../../resources/tools/testbed-setup/ansible/site.yaml"
-  ansible_topology_path     = "../../resources/tools/testbed-setup/ansible/cloud_topology.yaml"
+  ansible_file_path         = "../../fdio.infra.ansible/site.yaml"
+  ansible_topology_path     = "../../fdio.infra.ansible/cloud_topology.yaml"
   ansible_provision_pwd     = "Csit1234"
 
   # First run
diff --git a/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf b/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf
index 38a9133eeb..5dbc481938 100644
--- a/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf
+++ b/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf
@@ -50,7 +50,7 @@ variable "first_run_commands" {
 variable "ansible_file_path" {
   description = "Path to Ansible playbook"
   type = string
-  default = "../../resources/tools/testbed-setup/ansible/site.yaml"
+  default = "../../fdio.infra.ansible/site.yaml"
 }
 
 variable "ansible_python_executable" {
@@ -62,7 +62,7 @@ variable "ansible_python_executable" {
 variable "ansible_topology_path" {
   description = "Path to Ansible playbook which creates a topology file"
   type = string
-  default = "../../resources/tools/testbed-setup/ansible/cloud_topology.yaml"
+  default = "../../fdio.infra.ansible/cloud_topology.yaml"
 }
 
 variable "ansible_provision_pwd" {
diff --git a/fdio.infra.terraform/3n_aws_c5n/main.tf b/fdio.infra.terraform/3n_aws_c5n/main.tf
index 0aca7af05a..fca5eecff3 100644
--- a/fdio.infra.terraform/3n_aws_c5n/main.tf
+++ b/fdio.infra.terraform/3n_aws_c5n/main.tf
@@ -36,8 +36,8 @@ module "deploy" {
 
   # Ansible
   ansible_python_executable = "/usr/bin/python3"
-  ansible_file_path         = "../../resources/tools/testbed-setup/ansible/site.yaml"
-  ansible_topology_path     = "../../resources/tools/testbed-setup/ansible/cloud_topology.yaml"
+  ansible_file_path         = "../../fdio.infra.ansible/site.yaml"
+  ansible_topology_path     = "../../fdio.infra.ansible/cloud_topology.yaml"
   ansible_provision_pwd     = "Csit1234"
 
   # First run
diff --git a/requirements.txt b/requirements.txt
index b467d6f7ab..36d477d8e0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -31,7 +31,7 @@ scp==0.13.2
 ansible==2.10.7
 
 # PLRsearch dependencies
-dill==0.2.8.2
+dill==0.3.3
 numpy==1.17.3
 scipy==1.5.4
 
diff --git a/resources/libraries/bash/function/ansible.sh b/resources/libraries/bash/function/ansible.sh
index f522faa93b..3beca3fba4 100644
--- a/resources/libraries/bash/function/ansible.sh
+++ b/resources/libraries/bash/function/ansible.sh
@@ -22,7 +22,7 @@ function ansible_adhoc () {
     #
     # Variable read:
     # - ${WORKING_TOPOLOGY} - Reserved working topology.
-    # - ${TOOLS_DIR} - CSIT tools directory, where testbed-setup is located.
+    # - ${CSIT_DIR} - CSIT main directory, where ansible playbooks are located.
 
     set -exuo pipefail
 
@@ -33,7 +33,7 @@ function ansible_adhoc () {
     hosts=($(fgrep host "${WORKING_TOPOLOGY}" | cut -d ":" -f 2)) || {
         die "Failed to read hosts from working topology!"
     }
-    pushd "${TOOLS_DIR}"/testbed-setup/ansible || die "Pushd failed!"
+    pushd "${CSIT_DIR}"/fdio.infra.ansible || die "Pushd failed!"
     export ANSIBLE_HOST_KEY_CHECKING=False
     export ANSIBLE_STDOUT_CALLBACK=yaml
     export ANSIBLE_PIPELINING=true
@@ -54,7 +54,7 @@ function ansible_playbook () {
     #
     # Variable read:
     # - ${WORKING_TOPOLOGY} - Reserved working topology.
-    # - ${TOOLS_DIR} - CSIT tools directory, where testbed-setup is located.
+    # - ${CSIT_DIR} - CSIT main directory, where ansible playbooks are located.
 
     set -exuo pipefail
 
@@ -65,7 +65,7 @@ function ansible_playbook () {
     hosts=($(fgrep host "${WORKING_TOPOLOGY}" | cut -d ":" -f 2)) || {
         die "Failed to read hosts from working topology!"
     }
-    pushd "${TOOLS_DIR}"/testbed-setup/ansible || die "Pushd failed!"
+    pushd "${CSIT_DIR}"/fdio.infra.ansible || die "Pushd failed!"
     export ANSIBLE_HOST_KEY_CHECKING=False
     export ANSIBLE_STDOUT_CALLBACK=yaml
     export ANSIBLE_PIPELINING=true
diff --git a/resources/tools/testbed-setup/README.rst b/resources/tools/testbed-setup/README.rst
deleted file mode 100644
index 9059e28500..0000000000
--- a/resources/tools/testbed-setup/README.rst
+++ /dev/null
@@ -1,152 +0,0 @@
-Testbed Setup
-=============
-
-Introduction
-------------
-
-This directory contains the *high-level* process to set up a hardware machine
-as a CSIT testbed, either for use as a physical performance testbed host or as
-a vpp_device host.
-
-Code in this directory is NOT executed as part of a regular CSIT test case
-but is stored here for ad-hoc installation of HW, archiving and documentation
-purposes.
-
-Documentation below is step by step tutorial and assumes an understanding of PXE
-boot and `Ansible <https://www.ansible.com/>`_ and managing physical hardware
-via CIMC or IPMI.
-
-This process is not specific for Linux Foundation lab, but associated files and
-code, is based on the assumption that it runs in Linux Foundation environment.
-If run elsewhere, changes will be required in following files:
-
-#. Inventory directory: `ansible/inventories/sample_inventory/`
-#. Inventory files: `ansible/inventories/sample_inventory/hosts`
-
-The process below assumes that there is a host used for bootstrapping (referred
-to as a "Cobbler provision host" below), with reachable DHCP service.
-
-Ansible host
-------------
-
-Prerequisities for running Ansible
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-- CIMC/IPMI address, username, password are set in BIOS.
-- Ansible can be invoked on any host that has direct SSH connectivity to
-  the remote hosts that will be provisioned (does not need to be Cobbler
-  provision host). This may require installed ssh_keys `ssh-copy-id` on remote
-  host or disabled StrictHostChecking on host running Ansible:
-
-  ::
-
-  Host <host_ip or host subnet_ip>
-        StrictHostKeyChecking no
-        UserKnownHostsFile=/dev/null
-
-- Ansible version 2.7+ is installed via PIP or via standard package
-  distribution (apt, yum, dnf).
-- User `testuser` with password `Csit1234` is created with home folder
-  initialized on all remote machines that will be provisioned.
-- Inventory directory is created with same or similar content as
-  `inventories/lf_inventory` in `inventories/` directory (`sample_inventory`
-  can be used).
-- Group variables in `ansible/inventories/<inventory>/group_vars/all.yaml` are
-  adjusted per environment with special attention to `proxy_env` variable.
-- Host variables in `ansible/inventories/<inventory>/host_vars/x.x.x.x.yaml` are
-  defined.
-
-Ansible structure
-~~~~~~~~~~~~~~~~~
-
-Ansible is defining roles `tg` (Traffic Generator), `sut` (System Under Test),
-`vpp_device` (vpp_device host for functional device testing), `common`
-(Applicable for all hosts in inventory) and `cobbler` (Cobbler provision host).
-
-Each host has corresponding Ansible role mapped and is applied only if a host
-with that role is present in inventory file. As a part of optimization the role
-`common` contains Ansible tasks applied for all hosts.
-
-.. note::
-
-   You may see `[WARNING]: Could not match supplied host pattern, ignoring:
-   <role>` in case you have not define hosts for that particular role.
-
-Ansible structure is described below:
-
-.. code-block:: bash
-
-   .
-   ├── inventories                     # Contains all inventories.
-   │   ├── sample_inventory            # Sample, free for edits outside of LF.
-   │   │   ├── group_vars              # Variables applied for all hosts.
-   │   │   │   └── all.yaml
-   │   │   ├── hosts                   # Inventory list with sample hosts.
-   │   │   └── host_vars               # Variables applied for single host only.
-   │   │       └── 1.1.1.1.yaml        # Sample host with IP 1.1.1.1
-   │   └── lf_inventory                # Linux Foundation inventory.
-   │       ├── group_vars
-   │       │   └── all.yaml
-   │       ├── hosts
-   │       └── host_vars
-   ├── roles                           # CSIT roles.
-   │   ├── cobbler                     # Role applied for Cobbler host only.
-   │   ├── common                      # Role applied for all hosts.
-   │   ├── sut                         # Role applied for all SUTs only.
-   │   ├── tg                          # Role applied for all TGs only.
-   │   ├── tg_sut                      # Role applied for TGs and SUTs only.
-   │   └── vpp_device                  # Role applied for vpp_device only.
-   ├── site.yaml                       # Main playbook.
-   ├── sut.yaml                        # SUT playbook.
-   ├── tg.yaml                         # TG playbook.
-   ├── vault_pass                      # Main password for vault.
-   ├── vault.yml                       # Ansible vault storage.
-   └── vpp_device.yaml                 # vpp_device playbook.
-
-Tagging
-~~~~~~~
-
-Every task, handler, role or playbook is tagged with self-explanatory tag(s)
-that could be used to limit which Ansible objects are applied to target systems.
-
-You can see what tags are applied to tasks, roles, and static imports by
-running `ansible-playbook` with the `--list-tasks` option. You can display all
-tags applied to the tasks with the `--list-tags` option.
-
-Running Ansible
-~~~~~~~~~~~~~~~
-
-#. Go to ansible directory: `$ cd csit/resources/tools/testbed-setup/ansible`
-#. Run ansible on selected hosts:
-   `$ ansible-playbook --vault-password-file=vault_pass --extra-vars
-   '@vault.yml' --inventory <inventory_file> site.yaml --limit <host_ip>`
-#. (Optional) Run ansible on selected hosts with selected tags:
-   `$ ansible-playbook --vault-password-file=vault_pass --extra-vars
-   '@vault.yml' --inventory <inventory_file> site.yaml --limit <host_ip>
-   --tags 'copy-90-csit'`
-
-.. note::
-
-   In case you want to provision only particular role. You can use tags: `tg`,
-   `sut`, `vpp_device`.
-
-Baremetal provisioning of host via Ansible Cobbler module
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Baremetal provisioning of the host with Ansible is done via `Cobbler
-<https://cobbler.github.io/>`_. Ansible contains a role `cobbler` that includes
-a set of tasks for deploying Cobbler in a container on dedicated host.
-Container is built during Ansible run of `cobbler` role and it provides DHCPD,
-TFTPD, HTTTP and Cobbler services.
-
-There is a special set of tasks and handlers in `common` role that does include
-a system into Cobbler and reboots provisioned host.
-
-#. Go to Ansible directory: `$ cd csit/resources/tools/testbed-setup/ansible`
-#. Prepare Cobbler provision host via Ansible on dedicated hosts:
-   `$ ansible-playbook --vault-password-file=vault_pass --extra-vars
-   '@vault.yml' --inventory <inventory_file> site.yaml --limit <cobbler_ip>`
-#. Run Ansible on selected hosts with selected tags:
-   `$ ansible-playbook --vault-password-file=vault_pass --extra-vars
-   '@vault.yml' --inventory <inventory_file> site.yaml --limit <host_ip>
-   --tags 'provision'`
diff --git a/resources/tools/testbed-setup/ansible/roles/common/files/grub_aarch64 b/resources/tools/testbed-setup/ansible/roles/common/files/grub_aarch64
deleted file mode 100644
index 38a2cc38e0..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/common/files/grub_aarch64
+++ /dev/null
@@ -1,34 +0,0 @@
-# If you change this file, run 'update-grub' afterwards to update
-# /boot/grub/grub.cfg.
-# For full documentation of the options in this file, see:
-#   info -f grub -n 'Simple configuration'
-
-GRUB_DEFAULT=0
-GRUB_TIMEOUT=10
-GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian`
-GRUB_CMDLINE_LINUX_DEFAULT="console=ttyAMA0,115200n8"
-GRUB_CMDLINE_LINUX=""
-
-# Uncomment to enable BadRAM filtering, modify to suit your needs
-# This works with Linux (no patch required) and with any kernel that obtains
-# the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...)
-#GRUB_BADRAM="0x01234567,0xfefefefe,0x89abcdef,0xefefefef"
-
-# Uncomment to disable graphical terminal (grub-pc only)
-#GRUB_TERMINAL=console
-GRUB_TERMINAL=serial
-GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1"
-
-# The resolution used on graphical terminal
-# note that you can use only modes which your graphic card supports via VBE
-# you can see them in real GRUB with the command `vbeinfo'
-#GRUB_GFXMODE=640x480
-
-# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entries
-#GRUB_DISABLE_RECOVERY="true"
-
-# Uncomment to get a beep at grub start
-#GRUB_INIT_TUNE="480 440 1"
diff --git a/resources/tools/testbed-setup/ansible/roles/common/files/grub_x86_64 b/resources/tools/testbed-setup/ansible/roles/common/files/grub_x86_64
deleted file mode 100644
index d4e27b3f0f..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/common/files/grub_x86_64
+++ /dev/null
@@ -1,34 +0,0 @@
-# If you change this file, run 'update-grub' afterwards to update
-# /boot/grub/grub.cfg.
-# For full documentation of the options in this file, see:
-#   info -f grub -n 'Simple configuration'
-
-GRUB_DEFAULT=0
-GRUB_TIMEOUT=10
-GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian`
-GRUB_CMDLINE_LINUX_DEFAULT="console=tty0 console=ttyS0,115200n8"
-GRUB_CMDLINE_LINUX=""
-
-# Uncomment to enable BadRAM filtering, modify to suit your needs
-# This works with Linux (no patch required) and with any kernel that obtains
-# the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...)
-#GRUB_BADRAM="0x01234567,0xfefefefe,0x89abcdef,0xefefefef"
-
-# Uncomment to disable graphical terminal (grub-pc only)
-#GRUB_TERMINAL=console
-GRUB_TERMINAL=serial
-GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1"
-
-# The resolution used on graphical terminal
-# note that you can use only modes which your graphic card supports via VBE
-# you can see them in real GRUB with the command `vbeinfo'
-#GRUB_GFXMODE=640x480
-
-# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entries
-#GRUB_DISABLE_RECOVERY="true"
-
-# Uncomment to get a beep at grub start
-#GRUB_INIT_TUNE="480 440 1"