feat(infra): Infrastructure refresh part 2

Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: I8de6c660e6f50ca98e62bdeff4224e68fa683f1e

17 files changed, 9 insertions, 552 deletions

diff --git a/fdio.infra.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
deleted file mode 100644
index f6548a2ea4..0000000000
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.18.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-# file: host_vars/10.30.51.18.yaml
-
-hostname: "s18-nomad"
-inventory_cimc_hostname: "10.30.50.18"
-
-# User management.
-users:
-  - username: localadmin
-    groups: [adm, sudo]
-    password: "$6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1"
-    ssh_key:
-      - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKM1D1kkGX1l7fSma1MOgw2yLI7zJHwTCcfVROQ4hh7r peter.mikus@protonmail.ch"
-      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDCG7Shfr7ASXXwpazYDGFzChGl7i4HgY9n81GTwc17B/O19IiJdrxFcBQH19HMuTFtWU4d9bQ6xgzz2pojBN13L3pEsStCHovDlEYbvfRxI2l2hcAAop1j1E4izHAS9IvCoy1AgWqBg6tsfP5mzOwGbSbcdI9ADRKIHgDTVbHg9SqKed27bNOLU0u3/5ra2Oar/tVIW37geEqFV/nHIBZ03Y/mszvXP/t/hP5bgJIGJKkzTjLd1aqEcuGmubW+wTQnVnrhFB87dw91gPj6BVyV0+7Vt1wrvPKqP2sGJhojAMSrBQBySnlrYgEg00bwDgNGFevatfG9+nTId+nhoKBkXya3MjSp4HwrGqGcij3/h7ovlau3/iRhkqlSeqenaNm4zKTAXRTnb60j2WKa6im0zdqJX98anp4mhjE8xHhmmfZV3vRT8mtY4hF/lg79miXFHpWH97bZV6r/D9qj1HWI/laJfOC5MOJdRcLETwtsUNMHeHtVnY3yu0XFYNcl2Xwajtnz3waF7vn1QHvAM9p878+JrO/IEUqEc0yZWVvlhZ7Krx1pS+APoMy8097MYDGFzFTkYSstKLGbgm/S7dEiWuSVxmMUxW7JYO3gHrQ3f1EvAYh2UFdWy76Dzr5II9UpVwOwF+HL/Oy8Sk77bPaK+tn7Kh4Tx7WWE0+EOAgElQ== ayourtch@ayourtch-lnx"
-      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXUbbhesOpvPF+KI8nq4TXvEO/Un1aU/ehZ9clCyw9C40xjDkX2BlcX8WeHxFHe7fjFaCd07Vg73rn/3M9uNDnDxvjH1GQ0twvi3iBTO4PkHBBfGF9qnE8MYzno6FvlsVKLuUuPbfm8kbOQ+ZDfdXq6gdtXh0hSYYkqC1heNPCNsqaakkB99Edyle+Ot0V7cpW+Yo2wo98KuX/cgUEhVoA8QnNVE7zaWcjSXBZEteoA4gLpAbV6p67/d6H/2ykHTidBViYTEsHco56tJoA4nTPuAupDOLBcWXgF5TAN6z1aCn2JA1DDfniLakgrZ5oVj2qHhUmbxQAtnKQfHADjqzV jlinkes@jlinkes"
-      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD0GXoSGDZ95TE/TT3kf4ZS3Tiso0UO3MVhqAqZ/F6LOvLyqnMPfhxPz1XpHsDikxvKgwhZvdBm1dWbKkPsD7jtw0PGphQO8QuEwBd2ZMvxZ4Qg6lNDUl5x3zRO2nkbKpcqnOugGLTtXP+yfw/wfQ2HNFLDP9gE90xegsPT83PmRUntQlhbS3ByHcCSUScC+Y1heZXuoKNyrmUY46lxkKsNfhx8sQKo0YhB21atV/mcAQbAaO2LggmaQYGtWizqPNGWIRsi9W8ZYnKva67c3Pbv/TTfaqmrNCwOXJ8G9oL+/3MlKbl3b5mYlTs2a/e9yVgMNwUZVX7aiHpgPgaVjL6j swdev@BradyBunch-MacMini.local"
-      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCmo2YP4t/f58AAYH72rOe5VjYjk3wb/GY3aJEd5s9WspLhnsY0xBL67C+4kMq6VmQQvg0cUB8RJSFX1tUXMHCorVWnXNHkYomx0MCPcPUpVHuRyEqczYJ2pzgZsPzoEfw9E5hTrAiGzYFNAS/NOSavapVMDZxa1zsX7+sWQvJfmVtJWpcTQb0TkoWXRsy0YM3PYfUbYvK7lR3lGwyhwCcJn0WwWGreFB7bIok0poqqX5BgJ/okZuvC8II+UfuGoBHNhg49oqST1JlNi9gRqDNmLWkHRaneWZiF+Y2hdN3PRCdkt1x3eU0R+cdi5kPKslb6P0lsjOEA7fDLlq1+T2z1"
-sshd_disable_password_login: true
-
-# Nomad settings.
-nomad_certificates:
-  - src: "{{ file_nomad_ca_pem }}"
-    dest: "{{ nomad_ca_file }}"
-  - src: "{{ file_nomad_client_pem }}"
-    dest: "{{ nomad_cert_file }}"
-  - src: "{{ file_nomad_client_key_pem }}"
-    dest: "{{ nomad_key_file }}"
-nomad_datacenter: "yul1"
-nomad_node_name: "{{ hostname }}-{{ ansible_architecture }}"
-nomad_node_role: "client"
-nomad_node_class: "builder"
-nomad_options:
-  driver.raw_exec.enable: 1
-  docker.cleanup.image: false
-  docker.privileged.enabled: true
-  docker.volumes.enabled: true
-  driver.whitelist: "docker,raw_exec,exec"
-nomad_service_mgr: "systemd"
-nomad_retry_servers:
-  - "10.30.51.23"
-  - "10.30.51.24"
-  - "10.30.51.25"
-nomad_servers:
-  - "10.30.51.23:4647"
-  - "10.30.51.24:4647"
-  - "10.30.51.25:4647"
-
-# Consul settigs.
-consul_nomad_integration: true
-consul_certificates:
-  - src: "{{ file_consul_ca_pem }}"
-    dest: "{{ consul_ca_file }}"
-consul_datacenter: "yul1"
-consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
-consul_node_name: "{{ hostname }}"
-consul_node_role: "client"
-consul_retry_servers:
-  - "10.30.51.23"
-  - "10.30.51.24"
-  - "10.30.51.25"
-consul_service_mgr: "systemd"
-
-
-# Docker daemon settings.
-docker_daemon:
-  dns: ["172.17.0.1"]
-  dns-opts: []
-  dns-search: ["{{ansible_hostname}}"]
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.19.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.19.yaml
deleted file mode 100644
index 2266883dd2..0000000000
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.19.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-# file: host_vars/10.30.51.19.yaml
-
-hostname: "s19-nomad"
-inventory_cimc_hostname: "10.30.50.19"
-
-# User management.
-users:
-  - username: localadmin
-    groups: [adm, sudo]
-    password: "$6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1"
-    ssh_key:
-      - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKM1D1kkGX1l7fSma1MOgw2yLI7zJHwTCcfVROQ4hh7r peter.mikus@protonmail.ch"
-      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDCG7Shfr7ASXXwpazYDGFzChGl7i4HgY9n81GTwc17B/O19IiJdrxFcBQH19HMuTFtWU4d9bQ6xgzz2pojBN13L3pEsStCHovDlEYbvfRxI2l2hcAAop1j1E4izHAS9IvCoy1AgWqBg6tsfP5mzOwGbSbcdI9ADRKIHgDTVbHg9SqKed27bNOLU0u3/5ra2Oar/tVIW37geEqFV/nHIBZ03Y/mszvXP/t/hP5bgJIGJKkzTjLd1aqEcuGmubW+wTQnVnrhFB87dw91gPj6BVyV0+7Vt1wrvPKqP2sGJhojAMSrBQBySnlrYgEg00bwDgNGFevatfG9+nTId+nhoKBkXya3MjSp4HwrGqGcij3/h7ovlau3/iRhkqlSeqenaNm4zKTAXRTnb60j2WKa6im0zdqJX98anp4mhjE8xHhmmfZV3vRT8mtY4hF/lg79miXFHpWH97bZV6r/D9qj1HWI/laJfOC5MOJdRcLETwtsUNMHeHtVnY3yu0XFYNcl2Xwajtnz3waF7vn1QHvAM9p878+JrO/IEUqEc0yZWVvlhZ7Krx1pS+APoMy8097MYDGFzFTkYSstKLGbgm/S7dEiWuSVxmMUxW7JYO3gHrQ3f1EvAYh2UFdWy76Dzr5II9UpVwOwF+HL/Oy8Sk77bPaK+tn7Kh4Tx7WWE0+EOAgElQ== ayourtch@ayourtch-lnx"
-      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXUbbhesOpvPF+KI8nq4TXvEO/Un1aU/ehZ9clCyw9C40xjDkX2BlcX8WeHxFHe7fjFaCd07Vg73rn/3M9uNDnDxvjH1GQ0twvi3iBTO4PkHBBfGF9qnE8MYzno6FvlsVKLuUuPbfm8kbOQ+ZDfdXq6gdtXh0hSYYkqC1heNPCNsqaakkB99Edyle+Ot0V7cpW+Yo2wo98KuX/cgUEhVoA8QnNVE7zaWcjSXBZEteoA4gLpAbV6p67/d6H/2ykHTidBViYTEsHco56tJoA4nTPuAupDOLBcWXgF5TAN6z1aCn2JA1DDfniLakgrZ5oVj2qHhUmbxQAtnKQfHADjqzV jlinkes@jlinkes"
-      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD0GXoSGDZ95TE/TT3kf4ZS3Tiso0UO3MVhqAqZ/F6LOvLyqnMPfhxPz1XpHsDikxvKgwhZvdBm1dWbKkPsD7jtw0PGphQO8QuEwBd2ZMvxZ4Qg6lNDUl5x3zRO2nkbKpcqnOugGLTtXP+yfw/wfQ2HNFLDP9gE90xegsPT83PmRUntQlhbS3ByHcCSUScC+Y1heZXuoKNyrmUY46lxkKsNfhx8sQKo0YhB21atV/mcAQbAaO2LggmaQYGtWizqPNGWIRsi9W8ZYnKva67c3Pbv/TTfaqmrNCwOXJ8G9oL+/3MlKbl3b5mYlTs2a/e9yVgMNwUZVX7aiHpgPgaVjL6j swdev@BradyBunch-MacMini.local"
-      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCmo2YP4t/f58AAYH72rOe5VjYjk3wb/GY3aJEd5s9WspLhnsY0xBL67C+4kMq6VmQQvg0cUB8RJSFX1tUXMHCorVWnXNHkYomx0MCPcPUpVHuRyEqczYJ2pzgZsPzoEfw9E5hTrAiGzYFNAS/NOSavapVMDZxa1zsX7+sWQvJfmVtJWpcTQb0TkoWXRsy0YM3PYfUbYvK7lR3lGwyhwCcJn0WwWGreFB7bIok0poqqX5BgJ/okZuvC8II+UfuGoBHNhg49oqST1JlNi9gRqDNmLWkHRaneWZiF+Y2hdN3PRCdkt1x3eU0R+cdi5kPKslb6P0lsjOEA7fDLlq1+T2z1"
-sshd_disable_password_login: true
-
-# Nomad settings.
-nomad_certificates:
-  - src: "{{ file_nomad_ca_pem }}"
-    dest: "{{ nomad_ca_file }}"
-  - src: "{{ file_nomad_client_pem }}"
-    dest: "{{ nomad_cert_file }}"
-  - src: "{{ file_nomad_client_key_pem }}"
-    dest: "{{ nomad_key_file }}"
-nomad_datacenter: "yul1"
-nomad_node_name: "{{ hostname }}-{{ ansible_architecture }}"
-nomad_node_role: "client"
-nomad_node_class: "builder"
-nomad_options:
-  driver.raw_exec.enable: 1
-  docker.cleanup.image: false
-  docker.privileged.enabled: true
-  docker.volumes.enabled: true
-  driver.whitelist: "docker,raw_exec,exec"
-nomad_service_mgr: "systemd"
-nomad_retry_servers:
-  - "10.30.51.23"
-  - "10.30.51.24"
-  - "10.30.51.25"
-nomad_servers:
-  - "10.30.51.23:4647"
-  - "10.30.51.24:4647"
-  - "10.30.51.25:4647"
-
-# Consul settigs.
-consul_nomad_integration: true
-consul_certificates:
-  - src: "{{ file_consul_ca_pem }}"
-    dest: "{{ consul_ca_file }}"
-consul_datacenter: "yul1"
-consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
-consul_node_name: "{{ hostname }}"
-consul_node_role: "client"
-consul_retry_servers:
-  - "10.30.51.23"
-  - "10.30.51.24"
-  - "10.30.51.25"
-consul_service_mgr: "systemd"
-
-
-# Docker daemon settings.
-docker_daemon:
-  dns: ["172.17.0.1"]
-  dns-opts: []
-  dns-search: ["{{ansible_hostname}}"]
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.16.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.27.yaml
index 948a9f522a..b5947d668c 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.16.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.27.yaml
@@ -1,8 +1,8 @@
 ---
-# file: host_vars/10.30.51.16.yaml
+# file: host_vars/10.30.51.27.yaml
 
-hostname: "s16-nomad"
-inventory_cimc_hostname: "10.30.50.16"
+hostname: "s27-nomad"
+inventory_cimc_hostname: "10.30.50.27"
 
 # User management.
 users:
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.17.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml
index beda1b3afc..47f967c2f3 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.17.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml
@@ -1,8 +1,8 @@
 ---
-# file: host_vars/10.30.51.17.yaml
+# file: host_vars/10.30.51.28.yaml
 
-hostname: "s17-nomad"
-inventory_cimc_hostname: "10.30.50.17"
+hostname: "s28-nomad"
+inventory_cimc_hostname: "10.30.50.28"
 
 # User management.
 users:
@@ -60,7 +60,6 @@ consul_retry_servers:
   - "10.30.51.25"
 consul_service_mgr: "systemd"
 
-
 # Docker daemon settings.
 docker_daemon:
   dns: ["172.17.0.1"]
diff --git a/fdio.infra.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
deleted file mode 100644
index e1f4ebbe3f..0000000000
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.44.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# file: host_vars/10.30.51.44.yaml
-
-hostname: "s3-t21-sut1"
-grub:
-  audit: "0"
-  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
-  hpet: "disable"
-  intel_idle.max_cstate: "1"
-  intel_iommu: "on"
-  intel_pstate: "disable"
-  iommu: "pt"
-  isolcpus: "1-27,29-55,57-83,85-111"
-  mce: "off"
-  nmi_watchdog: "0"
-  nohz_full: "1-27,29-55,57-83,85-111"
-  nosoftlockup: true
-  numa_balancing: "disable"
-  processor.max_cstate: "1"
-  rcu_nocbs: "1-27,29-55,57-83,85-111"
-  tsc: "reliable"
-sysctl:
-  kernel:
-    watchdog_cpumask: "0,28,56,84"
-  vm:
-    nr_hugepages: 32768
-    max_map_count: 20000
-
-inventory_ipmi_hostname: "10.30.50.41"
-cpu_microarchitecture: "skylake"
-
-intel_700_matrix: "dpdk22.03"
diff --git a/fdio.infra.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
deleted file mode 100644
index a38f7f0845..0000000000
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.45.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# file: host_vars/10.30.51.45.yaml
-
-hostname: "s4-t21-tg1"
-grub:
-  audit: "0"
-  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192"
-  hpet: "disable"
-  intel_idle.max_cstate: "1"
-  intel_iommu: "on"
-  intel_pstate: "disable"
-  iommu: "pt"
-  isolcpus: "1-27,29-55,57-83,85-111"
-  mce: "off"
-  nmi_watchdog: "0"
-  nohz_full: "1-27,29-55,57-83,85-111"
-  nosoftlockup: true
-  numa_balancing: "disable"
-  processor.max_cstate: "1"
-  rcu_nocbs: "1-27,29-55,57-83,85-111"
-  tsc: "reliable"
-sysctl:
-  kernel:
-    watchdog_cpumask: "0,28,56,84"
-  vm:
-    nr_hugepages: 8192
-    max_map_count: 20000
-
-inventory_ipmi_hostname: "10.30.50.42"
-cpu_microarchitecture: "skylake"
-
-intel_700_matrix: "dpdk21.02"
diff --git a/fdio.infra.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
deleted file mode 100644
index 55d38a2fd5..0000000000
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.46.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# file: host_vars/10.30.51.46.yaml
-
-hostname: "s11-t31-sut1"
-grub:
-  audit: "0"
-  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
-  hpet: "disable"
-  intel_idle.max_cstate: "1"
-  intel_iommu: "on"
-  intel_pstate: "disable"
-  iommu: "pt"
-  isolcpus: "1-27,29-55,57-83,85-111"
-  mce: "off"
-  nmi_watchdog: "0"
-  nohz_full: "1-27,29-55,57-83,85-111"
-  nosoftlockup: true
-  numa_balancing: "disable"
-  processor.max_cstate: "1"
-  rcu_nocbs: "1-27,29-55,57-83,85-111"
-  tsc: "reliable"
-sysctl:
-  kernel:
-    watchdog_cpumask: "0,28,56,84"
-  vm:
-    nr_hugepages: 32768
-    max_map_count: 20000
-
-inventory_ipmi_hostname: "10.30.50.43"
-cpu_microarchitecture: "skylake"
-
-intel_700_matrix: "dpdk22.03"
diff --git a/fdio.infra.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
deleted file mode 100644
index 718201b151..0000000000
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.47.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# file: host_vars/10.30.51.47.yaml
-
-hostname: "s12-t31-sut2"
-grub:
-  audit: "0"
-  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
-  hpet: "disable"
-  intel_idle.max_cstate: "1"
-  intel_iommu: "on"
-  intel_pstate: "disable"
-  iommu: "pt"
-  isolcpus: "1-27,29-55,57-83,85-111"
-  mce: "off"
-  nmi_watchdog: "0"
-  nohz_full: "1-27,29-55,57-83,85-111"
-  nosoftlockup: true
-  numa_balancing: "disable"
-  processor.max_cstate: "1"
-  rcu_nocbs: "1-27,29-55,57-83,85-111"
-  tsc: "reliable"
-sysctl:
-  kernel:
-    watchdog_cpumask: "0,28,56,84"
-  vm:
-    nr_hugepages: 32768
-    max_map_count: 20000
-
-inventory_ipmi_hostname: "10.30.50.44"
-cpu_microarchitecture: "skylake"
-
-intel_700_matrix: "dpdk22.03"
diff --git a/fdio.infra.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
deleted file mode 100644
index caa0f54b16..0000000000
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.48.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# file: host_vars/10.30.51.48.yaml
-
-hostname: "s13-t31-tg1"
-grub:
-  audit: "0"
-  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192"
-  hpet: "disable"
-  intel_idle.max_cstate: "1"
-  intel_iommu: "on"
-  intel_pstate: "disable"
-  iommu: "pt"
-  isolcpus: "1-27,29-55,57-83,85-111"
-  mce: "off"
-  nmi_watchdog: "0"
-  nohz_full: "1-27,29-55,57-83,85-111"
-  nosoftlockup: true
-  numa_balancing: "disable"
-  processor.max_cstate: "1"
-  rcu_nocbs: "1-27,29-55,57-83,85-111"
-  tsc: "reliable"
-sysctl:
-  kernel:
-    watchdog_cpumask: "0,28,56,84"
-  vm:
-    nr_hugepages: 8192
-    max_map_count: 20000
-
-inventory_ipmi_hostname: "10.30.50.45"
-cpu_microarchitecture: "skylake"
-
-intel_700_matrix: "dpdk21.02"
diff --git a/fdio.infra.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
deleted file mode 100644
index 2b1eeff967..0000000000
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# file: host_vars/10.30.51.52.yaml
-
-hostname: "s5-t22-sut1"
-grub:
-  audit: "0"
-  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
-  hpet: "disable"
-  intel_idle.max_cstate: "1"
-  intel_iommu: "on"
-  intel_pstate: "disable"
-  iommu: "pt"
-  isolcpus: "1-27,29-55,57-83,85-111"
-  mce: "off"
-  nmi_watchdog: "0"
-  nohz_full: "1-27,29-55,57-83,85-111"
-  nosoftlockup: true
-  numa_balancing: "disable"
-  processor.max_cstate: "1"
-  rcu_nocbs: "1-27,29-55,57-83,85-111"
-  tsc: "reliable"
-sysctl:
-  kernel:
-    watchdog_cpumask: "0,28,56,84"
-  vm:
-    nr_hugepages: 32768
-    max_map_count: 20000
-
-inventory_ipmi_hostname: "10.30.50.49"
-cpu_microarchitecture: "skylake"
-
-intel_700_matrix: "dpdk22.03"
diff --git a/fdio.infra.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
deleted file mode 100644
index 5806993388..0000000000
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# file: host_vars/10.30.51.53.yaml
-
-hostname: "s6-t22-tg1"
-grub:
-  audit: "0"
-  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192"
-  hpet: "disable"
-  intel_idle.max_cstate: "1"
-  intel_iommu: "on"
-  intel_pstate: "disable"
-  iommu: "pt"
-  isolcpus: "1-27,29-55,57-83,85-111"
-  mce: "off"
-  nmi_watchdog: "0"
-  nohz_full: "1-27,29-55,57-83,85-111"
-  nosoftlockup: true
-  numa_balancing: "disable"
-  processor.max_cstate: "1"
-  rcu_nocbs: "1-27,29-55,57-83,85-111"
-  tsc: "reliable"
-sysctl:
-  kernel:
-    watchdog_cpumask: "0,28,56,84"
-  vm:
-    nr_hugepages: 8192
-    max_map_count: 20000
-
-inventory_ipmi_hostname: "10.30.50.50"
-cpu_microarchitecture: "skylake"
-
-intel_700_matrix: "dpdk21.02"
diff --git a/fdio.infra.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
deleted file mode 100644
index 50908d7df8..0000000000
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# file: host_vars/10.30.51.54.yaml
-
-hostname: "s7-t23-sut1"
-grub:
-  audit: "0"
-  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
-  hpet: "disable"
-  intel_idle.max_cstate: "1"
-  intel_iommu: "on"
-  intel_pstate: "disable"
-  iommu: "pt"
-  isolcpus: "1-27,29-55,57-83,85-111"
-  mce: "off"
-  nmi_watchdog: "0"
-  nohz_full: "1-27,29-55,57-83,85-111"
-  nosoftlockup: true
-  numa_balancing: "disable"
-  processor.max_cstate: "1"
-  rcu_nocbs: "1-27,29-55,57-83,85-111"
-  tsc: "reliable"
-sysctl:
-  kernel:
-    watchdog_cpumask: "0,28,56,84"
-  vm:
-    nr_hugepages: 32768
-    max_map_count: 20000
-
-inventory_ipmi_hostname: "10.30.50.51"
-cpu_microarchitecture: "skylake"
-
-intel_700_matrix: "dpdk22.03"
diff --git a/fdio.infra.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
deleted file mode 100644
index 9404e18ae0..0000000000
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# file: host_vars/10.30.51.55.yaml
-
-hostname: "s8-t23-tg1"
-grub:
-  audit: "0"
-  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192"
-  hpet: "disable"
-  intel_idle.max_cstate: "1"
-  intel_iommu: "on"
-  intel_pstate: "disable"
-  iommu: "pt"
-  isolcpus: "1-27,29-55,57-83,85-111"
-  mce: "off"
-  nmi_watchdog: "0"
-  nohz_full: "1-27,29-55,57-83,85-111"
-  nosoftlockup: true
-  numa_balancing: "disable"
-  processor.max_cstate: "1"
-  rcu_nocbs: "1-27,29-55,57-83,85-111"
-  tsc: "reliable"
-sysctl:
-  kernel:
-    watchdog_cpumask: "0,28,56,84"
-  vm:
-    nr_hugepages: 8192
-    max_map_count: 20000
-
-inventory_ipmi_hostname: "10.30.50.52"
-cpu_microarchitecture: "skylake"
-
-intel_700_matrix: "dpdk21.02"
diff --git a/fdio.infra.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
deleted file mode 100644
index a100bcca8a..0000000000
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# file: host_vars/10.30.51.58.yaml
-
-hostname: "s14-t32-sut1"
-grub:
-  audit: "0"
-  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
-  hpet: "disable"
-  intel_idle.max_cstate: "1"
-  intel_iommu: "on"
-  intel_pstate: "disable"
-  iommu: "pt"
-  isolcpus: "1-27,29-55,57-83,85-111"
-  mce: "off"
-  nmi_watchdog: "0"
-  nohz_full: "1-27,29-55,57-83,85-111"
-  nosoftlockup: true
-  numa_balancing: "disable"
-  processor.max_cstate: "1"
-  rcu_nocbs: "1-27,29-55,57-83,85-111"
-  tsc: "reliable"
-sysctl:
-  kernel:
-    watchdog_cpumask: "0,28,56,84"
-  vm:
-    nr_hugepages: 32768
-    max_map_count: 20000
-
-inventory_ipmi_hostname: "10.30.50.55"
-cpu_microarchitecture: "skylake"
-
-intel_700_matrix: "dpdk22.03"
diff --git a/fdio.infra.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
deleted file mode 100644
index be5d0b09ae..0000000000
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# file: host_vars/10.30.51.59.yaml
-
-hostname: "s15-t32-sut2"
-grub:
-  audit: "0"
-  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
-  hpet: "disable"
-  intel_idle.max_cstate: "1"
-  intel_iommu: "on"
-  intel_pstate: "disable"
-  iommu: "pt"
-  isolcpus: "1-27,29-55,57-83,85-111"
-  mce: "off"
-  nmi_watchdog: "0"
-  nohz_full: "1-27,29-55,57-83,85-111"
-  nosoftlockup: true
-  numa_balancing: "disable"
-  processor.max_cstate: "1"
-  rcu_nocbs: "1-27,29-55,57-83,85-111"
-  tsc: "reliable"
-sysctl:
-  kernel:
-    watchdog_cpumask: "0,28,56,84"
-  vm:
-    nr_hugepages: 32768
-    max_map_count: 20000
-
-inventory_ipmi_hostname: "10.30.50.56"
-cpu_microarchitecture: "skylake"
-
-intel_700_matrix: "dpdk22.03"
diff --git a/fdio.infra.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
deleted file mode 100644
index d340e39102..0000000000
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.60.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# file: host_vars/10.30.51.60.yaml
-
-hostname: "s16-t32-tg1"
-grub:
-  audit: "0"
-  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192"
-  hpet: "disable"
-  intel_idle.max_cstate: "1"
-  intel_iommu: "on"
-  intel_pstate: "disable"
-  iommu: "pt"
-  isolcpus: "1-27,29-55,57-83,85-111"
-  mce: "off"
-  nmi_watchdog: "0"
-  nohz_full: "1-27,29-55,57-83,85-111"
-  nosoftlockup: true
-  numa_balancing: "disable"
-  processor.max_cstate: "1"
-  rcu_nocbs: "1-27,29-55,57-83,85-111"
-  tsc: "reliable"
-sysctl:
-  kernel:
-    watchdog_cpumask: "0,28,56,84"
-  vm:
-    nr_hugepages: 8192
-    max_map_count: 20000
-
-inventory_ipmi_hostname: "10.30.50.57"
-cpu_microarchitecture: "skylake"
-
-intel_700_matrix: "dpdk21.02"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/hosts b/fdio.infra.ansible/inventories/lf_inventory/hosts
index f9801ea2af..3623cf4b1d 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/hosts
+++ b/fdio.infra.ansible/inventories/lf_inventory/hosts
@@ -55,32 +55,10 @@ all:
         10.30.51.24: #s24-nomad - skylake
         10.30.51.25: #s25-nomad - skylake
         10.30.51.26: #s26-nomad - skylake
+        10.30.51.27: #s27-nomad - skylake
+        10.30.51.28: #s28-nomad - skylake
         10.30.51.91: #s58-nomad - neoverse n1
         10.30.51.92: #s59-nomad - neoverse n1
     dev:
       hosts:
-        10.30.51.38: #fdio-marvell-dev - thunderx 88xx
-    decomission:
-      hosts:
-        10.32.8.10: #s28-t26t35-tg1 - skylake
-        10.32.8.11: #s29-t26-sut1 - denverton
-        10.32.8.12: #s30-t35-sut1 - denverton
-        10.32.8.13: #s31-t35-sut2 - denverton
-        10.30.51.44: #s3-t21-sut1 - skylake
-        10.30.51.45: #s4-t21-tg1 - skylake
-        10.30.51.46: #s11-t31-sut1 - skylake
-        10.30.51.47: #s12-t31-sut2 - skylake
-        10.30.51.48: #s13-t31-tg1 - skylake
-        10.30.51.52: #s5-t22-sut1 - skylake
-        10.30.51.53: #s6-t22-tg1 - skylake
-        10.30.51.55: #s8-t23-tg1 - skylake
-        10.30.51.54: #s7-t23-sut1 - skylake
-        10.30.51.58: #s14-t32-sut1 - skylake
-        10.30.51.59: #s15-t32-sut2 - skylake
-        10.30.51.60: #s16-t32-tg1 - skylake
-        10.30.51.39: #s53-nomad - thunderx 88xx
-        10.30.51.40: #s54-nomad - thunderx 88xx
-        10.30.51.65: #s52-nomad - thunderx 88xx
-        10.30.51.66: #s51-nomad - thunderx 88xx
-        10.30.51.67: #s49-nomad - thunderx 88xx
-        10.30.51.68: #s50-nomad - thunderx 88xx
\ No newline at end of file
+        10.30.51.38: #fdio-marvell-dev - thunderx 88xx
\ No newline at end of file