feat(ansible): Repurpose obsolete vpp-device

Signed-off-by: pmikus <[email protected]>
Change-Id: I95171ab59dfe1b5a98c36a839233d14e9ddb7ce5

diff --git a/fdio.infra.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 117c6d2..7c85cfd 100644 (file)
--- a/fdio.infra.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
@@ -2,15 +2,7 @@
 # file: host_vars/10.30.51.50.yaml
 
 hostname: "s1-t11-sut1"
-grub:
-  hugepagesz: "2M"
-  hugepages: 32768
-  iommu: "on"
-  vfio.enable_unsafe_noiommu_mode: 1
 inventory_ipmi_hostname: "10.30.50.47"
-cpu_microarchitecture: "skylake"
-
-intel_800_matrix: "dpdk22.03"
 
 # User management.
 users:
@@ -38,7 +30,7 @@ nomad_certificates:
 nomad_datacenter: "yul1"
 nomad_node_name: "{{ hostname }}-{{ ansible_architecture }}"
 nomad_node_role: "client"
-nomad_node_class: "csit"
+nomad_node_class: "hst"
 nomad_options:
   driver.raw_exec.enable: 1
   docker.cleanup.image: false
@@ -89,8 +81,6 @@ vault_version: "1.13.1"
 
 # Docker settings.
 docker_daemon:
-  default-shm-size: "1073741824"
   dns: ["172.17.0.1"]
   dns-opts: []
   dns-search: ["{{ ansible_hostname }}"]
-  host: ["172.17.0.1:/var/run/docker.sock"]

diff --git a/fdio.infra.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 875b759..135b5ea 100644 (file)
--- a/fdio.infra.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
@@ -2,15 +2,7 @@
 # file: host_vars/10.30.51.51.yaml
 
 hostname: "s2-t12-sut1"
-grub:
-  hugepagesz: "2M"
-  hugepages: 32768
-  iommu: "on"
-  vfio.enable_unsafe_noiommu_mode: 1
 inventory_ipmi_hostname: "10.30.50.48"
-cpu_microarchitecture: "skylake"
-
-intel_800_matrix: "dpdk22.03"
 
 # User management.
 users:
@@ -38,7 +30,7 @@ nomad_certificates:
 nomad_datacenter: "yul1"
 nomad_node_name: "{{ hostname }}-{{ ansible_architecture }}"
 nomad_node_role: "client"
-nomad_node_class: "csit"
+nomad_node_class: "hst"
 nomad_options:
   driver.raw_exec.enable: 1
   docker.cleanup.image: false
@@ -89,8 +81,6 @@ vault_version: "1.13.1"
 
 # Docker settings.
 docker_daemon:
-  default-shm-size: "1073741824"
   dns: ["172.17.0.1"]
   dns-opts: []
   dns-search: ["{{ ansible_hostname }}"]
-  host: ["172.17.0.1:/var/run/docker.sock"]

diff --git a/fdio.infra.ansible/inventories/lf_inventory/hosts b/fdio.infra.ansible/inventories/lf_inventory/hosts
index b7109a1..420adc3 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/hosts
+++ b/fdio.infra.ansible/inventories/lf_inventory/hosts
@@ -53,8 +53,6 @@ all:
       hosts:
         10.30.51.30: #s30-t15-sut1 - sapphirerapids
         10.30.51.31: #s31-t16-sut1 - sapphirerapids
-        10.30.51.50: #s1-t11-sut1 - skylake
-        10.30.51.51: #s2-t12-sut1 - skylake
         10.30.51.70: #s55-t13-sut1 - thunderx2 9980
         10.30.51.71: #s56-t14-sut1 - thunderx2 9980
     nomad:
@@ -67,8 +65,10 @@ all:
         10.30.51.26: #s26-nomad - skylake
         10.30.51.27: #s27-nomad - skylake
         10.30.51.28: #s28-nomad - skylake
+        10.30.51.50: #s1-t11-sut1 - skylake
+        10.30.51.51: #s2-t12-sut1 - 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
\ No newline at end of file
+        10.30.51.38: #fdio-marvell-dev - thunderx 88xx