feat(infra): Infrastructure refresh part 3

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

17 files changed, 2 insertions, 478 deletions

diff --git a/docs/lab/fdio-dc-physical.md b/docs/lab/fdio-dc-physical.md
index 701c47e523..60a168f0a5 100644
--- a/docs/lab/fdio-dc-physical.md
+++ b/docs/lab/fdio-dc-physical.md
@@ -80,9 +80,6 @@ yul1-11-lf-tor-switch,up,switch,uplink,?,?,?,?,3016.11,u47
 mtl1-6-7050QX-32,up,switch,uplink,?,?,?,?,3016.11,u46
 fdio-marvell-dev,up,N/A,dev,ThunderX-88XX,N/A,10.30.51.38,10.30.50.38,3016.11,u45
 s56-t14-sut1,up,t14,1n-tx2,ThunderX2-9980,N/A,10.30.51.71,10.30.50.71,3016.11,u41-u42
-s20-nomad,up,nomad-cluster1,nomad-client,UCSC-C240-M4SX,FCH1950V1FQ,10.30.51.20,10.30.50.20,3016.11,u39-u40
-s22-nomad,up,nomad-cluster1,nomad-client,UCSC-C240-M4SX,FCH2013V0HZ,10.30.51.22,10.30.50.22,3016.11,u37-u38
-s21-nomad,up,nomad-cluster1,nomad-client,UCSC-C240-M4SX,FCH2013V0J2,10.30.51.21,10.30.50.21,3016.11,u35-u36
 s78-t38-sut1,up,t38,3n-icx,SYS-740GP-TNRT,C7470KL03P50450,10.30.51.78,10.30.50.78,3016.11,u31-u34
 s79-t38-sut2,up,t38,3n-icx,SYS-740GP-TNRT,C7470KL07P50297,10.30.51.79,10.30.50.79,3016.11,u27-u30
 s80-t38-tg1,up,t38,3n-icx,SYS-740GP-TNRT,C7470KL03P50454,10.30.51.80,10.30.50.80,3016.11,u23-u26
diff --git a/fdio.infra.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
deleted file mode 100644
index 9bf93fac08..0000000000
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.20.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
----
-# file: host_vars/10.30.51.20.yaml
-
-hostname: "s20-nomad"
-inventory_cimc_hostname: "10.30.50.20"
-
-# 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.21.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml
deleted file mode 100644
index d3cf2e84b2..0000000000
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
----
-# file: host_vars/10.30.51.21.yaml
-
-hostname: "s21-nomad"
-inventory_cimc_hostname: "10.30.50.21"
-
-# 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.22.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml
deleted file mode 100644
index 5ae1a38174..0000000000
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-# file: host_vars/10.30.51.22.yaml
-
-hostname: "s22-nomad"
-inventory_cimc_hostname: "10.30.50.22"
-
-# 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/hosts b/fdio.infra.ansible/inventories/lf_inventory/hosts
index 3623cf4b1d..6b057da670 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/hosts
+++ b/fdio.infra.ansible/inventories/lf_inventory/hosts
@@ -44,13 +44,6 @@ all:
         10.30.51.71: #s56-t14-sut1 - thunderx2 9980
     nomad:
       hosts:
-        10.30.51.16: #s16-nomad - haswell
-        10.30.51.17: #s17-nomad - haswell
-        10.30.51.18: #s18-nomad - haswell
-        10.30.51.19: #s19-nomad - haswell
-        10.30.51.20: #s20-nomad - haswell
-        10.30.51.21: #s21-nomad - haswell
-        10.30.51.22: #s22-nomad - haswell
         10.30.51.23: #s23-nomad - skylake
         10.30.51.24: #s24-nomad - skylake
         10.30.51.25: #s25-nomad - skylake
diff --git a/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf b/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf
index 5d854fda8d..527f20cb8b 100755
--- a/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf
+++ b/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf
@@ -37,9 +37,6 @@ dhcp-option=yul1_2,option:dns-server,1.1.1.1
 dhcp-option=yul1_2,option:dns-server,8.8.8.8
 
 # Hosts DHCP settings yul1_1 subnet.
-dhcp-host=00:f2:8b:7c:fb:12,10.30.51.20,s20-nomad,infinite # enp8s0f0
-dhcp-host=00:42:68:6f:68:ee,10.30.51.21,s21-nomad,infinite # enp9s0f0
-dhcp-host=00:42:68:6f:6f:c0,10.30.51.22,s22-nomad,infinite # enp9s0f0
 dhcp-host=ac:1f:6b:5a:6a:d4,10.30.51.23,s23-nomad,infinite # eno1
 dhcp-host=ac:1f:6b:5a:6a:b4,10.30.51.24,s24-nomad,infinite # eno1
 dhcp-host=ac:1f:6b:5a:6b:08,10.30.51.25,s25-nomad,infinite # eno1
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:42:68:6f:68:ee b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:42:68:6f:68:ee
deleted file mode 100644
index 1b01c517dc..0000000000
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:42:68:6f:68:ee
+++ /dev/null
@@ -1,4 +0,0 @@
-menuentry "Install s21-nomad" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=00:42:68:6f:68:ee url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/00:42:68:6f:68:ee/ --- console=ttyS0,115200n8 quiet
-    initrd   /casper/ubuntu-jammy-amd64/initrd
-}
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:42:68:6f:6f:c0 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:42:68:6f:6f:c0
deleted file mode 100644
index ef184c2fed..0000000000
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:42:68:6f:6f:c0
+++ /dev/null
@@ -1,4 +0,0 @@
-menuentry "Install s21-nomad" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=00:42:68:6f:6f:c0 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/00:42:68:6f:6f:c0/ --- console=ttyS0,115200n8 quiet
-    initrd   /casper/ubuntu-jammy-amd64/initrd
-}
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:f2:8b:7c:fb:12 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:f2:8b:7c:fb:12
deleted file mode 100644
index 969571b85f..0000000000
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:f2:8b:7c:fb:12
+++ /dev/null
@@ -1,4 +0,0 @@
-menuentry "Install s20-nomad" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=00:f2:8b:7c:fb:12 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.21:8081/ubuntu_jammy_amd64/00:f2:8b:7c:fb:12/ --- console=ttyS0,115200n8 quiet
-    initrd   /casper/ubuntu-jammy-amd64/initrd
-}
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/00:42:68:6f:68:ee/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/00:42:68:6f:68:ee/meta-data
deleted file mode 100644
index e69de29bb2..0000000000
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/00:42:68:6f:68:ee/meta-data
+++ /dev/null
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/00:42:68:6f:68:ee/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/00:42:68:6f:68:ee/user-data
deleted file mode 100644
index 0b9c7552ad..0000000000
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/00:42:68:6f:68:ee/user-data
+++ /dev/null
@@ -1,83 +0,0 @@
-#cloud-config
-autoinstall:
-  version: 1
-  apt:
-    geoip: true
-    preserve_sources_list: false
-    primary:
-    - arches: [amd64, i386]
-      uri: http://ca.archive.ubuntu.com/ubuntu
-    - arches: [default]
-      uri: http://ports.ubuntu.com/ubuntu-ports
-  identity:
-    hostname: s21-nomad
-    password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1
-    realname: localadmin
-    username: localadmin
-  keyboard:
-    layout: us
-    toggle: null
-    variant: ''
-  locale: en_US.UTF-8
-  network:
-    ethernets:
-      enp9s0f0:
-        addresses: [ 10.30.51.21/24 ]
-        dhcp4: false
-        gateway4: 10.30.51.1
-        nameservers:
-          addresses: [ 1.1.1.1, 8.8.8.8 ]
-    version: 2
-  packages:
-    - python3
-  refresh-installer:
-    update: no
-  ssh:
-    allow-pw: true
-    authorized-keys: []
-    install-server: true
-  storage:
-    config:
-    - grub_device: false
-      id: disk-sda
-      path: /dev/sda
-      ptable: gpt
-      preserve: false
-      type: disk
-      wipe: superblock-recursive
-    - device: disk-sda
-      grub_device: true
-      id: partition-0
-      flag: boot
-      number: 1
-      preserve: false
-      size: 536870912
-      type: partition
-      wipe: superblock
-    - id: format-0
-      fstype: fat32
-      preserve: false
-      type: format
-      volume: partition-0
-    - device: disk-sda
-      flag: ''
-      grub_device: false
-      id: partition-1
-      number: 2
-      preserve: false
-      size: -1
-      type: partition
-      wipe: superblock
-    - fstype: ext4
-      id: format-1
-      preserve: false
-      type: format
-      volume: partition-1
-    - device: format-1
-      id: mount-1
-      path: /
-      type: mount
-    - device: format-0
-      id: mount-0
-      path: /boot/efi
-      type: mount
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/00:42:68:6f:6f:c0/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/00:42:68:6f:6f:c0/meta-data
deleted file mode 100644
index e69de29bb2..0000000000
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/00:42:68:6f:6f:c0/meta-data
+++ /dev/null
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/00:42:68:6f:6f:c0/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/00:42:68:6f:6f:c0/user-data
deleted file mode 100644
index 4f4d35826f..0000000000
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/00:42:68:6f:6f:c0/user-data
+++ /dev/null
@@ -1,83 +0,0 @@
-#cloud-config
-autoinstall:
-  version: 1
-  apt:
-    geoip: true
-    preserve_sources_list: false
-    primary:
-    - arches: [amd64, i386]
-      uri: http://ca.archive.ubuntu.com/ubuntu
-    - arches: [default]
-      uri: http://ports.ubuntu.com/ubuntu-ports
-  identity:
-    hostname: s22-nomad
-    password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1
-    realname: localadmin
-    username: localadmin
-  keyboard:
-    layout: us
-    toggle: null
-    variant: ''
-  locale: en_US.UTF-8
-  network:
-    ethernets:
-      enp9s0f0:
-        addresses: [ 10.30.51.22/24 ]
-        dhcp4: false
-        gateway4: 10.30.51.1
-        nameservers:
-          addresses: [ 1.1.1.1, 8.8.8.8 ]
-    version: 2
-  packages:
-    - python3
-  refresh-installer:
-    update: no
-  ssh:
-    allow-pw: true
-    authorized-keys: []
-    install-server: true
-  storage:
-    config:
-    - grub_device: false
-      id: disk-sda
-      path: /dev/sda
-      ptable: gpt
-      preserve: false
-      type: disk
-      wipe: superblock-recursive
-    - device: disk-sda
-      grub_device: true
-      id: partition-0
-      flag: boot
-      number: 1
-      preserve: false
-      size: 536870912
-      type: partition
-      wipe: superblock
-    - id: format-0
-      fstype: fat32
-      preserve: false
-      type: format
-      volume: partition-0
-    - device: disk-sda
-      flag: ''
-      grub_device: false
-      id: partition-1
-      number: 2
-      preserve: false
-      size: -1
-      type: partition
-      wipe: superblock
-    - fstype: ext4
-      id: format-1
-      preserve: false
-      type: format
-      volume: partition-1
-    - device: format-1
-      id: mount-1
-      path: /
-      type: mount
-    - device: format-0
-      id: mount-0
-      path: /boot/efi
-      type: mount
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/00:f2:8b:7c:fb:12/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/00:f2:8b:7c:fb:12/meta-data
deleted file mode 100644
index e69de29bb2..0000000000
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/00:f2:8b:7c:fb:12/meta-data
+++ /dev/null
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/00:f2:8b:7c:fb:12/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/00:f2:8b:7c:fb:12/user-data
deleted file mode 100644
index 831dff83f3..0000000000
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/00:f2:8b:7c:fb:12/user-data
+++ /dev/null
@@ -1,83 +0,0 @@
-#cloud-config
-autoinstall:
-  version: 1
-  apt:
-    geoip: true
-    preserve_sources_list: false
-    primary:
-    - arches: [amd64, i386]
-      uri: http://ca.archive.ubuntu.com/ubuntu
-    - arches: [default]
-      uri: http://ports.ubuntu.com/ubuntu-ports
-  identity:
-    hostname: s20-nomad
-    password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1
-    realname: localadmin
-    username: localadmin
-  keyboard:
-    layout: us
-    toggle: null
-    variant: ''
-  locale: en_US.UTF-8
-  network:
-    ethernets:
-      enp8s0f0:
-        addresses: [ 10.30.51.20/24 ]
-        dhcp4: false
-        gateway4: 10.30.51.1
-        nameservers:
-          addresses: [ 1.1.1.1, 8.8.8.8 ]
-    version: 2
-  packages:
-    - python3
-  refresh-installer:
-    update: no
-  ssh:
-    allow-pw: true
-    authorized-keys: []
-    install-server: true
-  storage:
-    config:
-    - grub_device: false
-      id: disk-sda
-      path: /dev/sda
-      ptable: gpt
-      preserve: false
-      type: disk
-      wipe: superblock-recursive
-    - device: disk-sda
-      grub_device: true
-      id: partition-0
-      flag: boot
-      number: 1
-      preserve: false
-      size: 536870912
-      type: partition
-      wipe: superblock
-    - id: format-0
-      fstype: fat32
-      preserve: false
-      type: format
-      volume: partition-0
-    - device: disk-sda
-      flag: ''
-      grub_device: false
-      id: partition-1
-      number: 2
-      preserve: false
-      size: -1
-      type: partition
-      wipe: superblock
-    - fstype: ext4
-      id: format-1
-      preserve: false
-      type: format
-      volume: partition-1
-    - device: format-1
-      id: mount-1
-      path: /
-      type: mount
-    - device: format-0
-      id: mount-0
-      path: /boot/efi
-      type: mount
\ No newline at end of file
diff --git a/topologies/available/lf_2n_clx_testbed27.yaml b/topologies/available/lf_2n_clx_testbed27.yaml
index 9f4dbe93e1..63e16d90e2 100644
--- a/topologies/available/lf_2n_clx_testbed27.yaml
+++ b/topologies/available/lf_2n_clx_testbed27.yaml
@@ -179,7 +179,7 @@ nodes:
         model: Mellanox-CX556A
       port8:
         # s33-t27-sut1-c9/p2 - 100GE-port2 ConnectX5-2p100GE.
-        mac_address: "ec:0d:9a:8c:c6:96"
+        mac_address: "ec:0d:9a:8c:c6:97"
         pci_address: "0000:5e:00.1"
         ip4_address: "172.16.80.1"
         driver: mlx5_core
diff --git a/topologies/available/lf_3n_icx_testbed37.yaml b/topologies/available/lf_3n_icx_testbed37.yaml
index 59d0bb1088..6cc31eb187 100644
--- a/topologies/available/lf_3n_icx_testbed37.yaml
+++ b/topologies/available/lf_3n_icx_testbed37.yaml
@@ -164,7 +164,7 @@ nodes:
     interfaces:
       port1:
         # s66-t37-sut2-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE.
-        mac_address: "40:a6:b7:67:27:5c"
+        mac_address: "40:a6:b7:67:27:54"
         pci_address: "0000:17:00.0"
         ip4_address: "172.16.10.3"
         driver: ice