X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Ftestbed-setup%2Fansible%2Finventories%2Flf_inventory%2Fhosts;h=cc0e0b39867e1ef0c2437706cc8253d00a437a44;hp=35c4e2254f8914157ec0b4c2492d301c3adce4f3;hb=e42ba705ccac080dfa5fd4d1bd2f3c1bb897ecff;hpb=04ea580e111ddf5be6101be1fbfe9fde56f1a214

diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts
index 35c4e2254f..cc0e0b3986 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts
@@ -1,53 +1,74 @@
 all:
   children:
-    haswell:
-      children:
-        tg:
-          hosts:
-            10.30.51.16: null #t1-tg1
-            10.30.51.20: null #t2-tg1
-            10.30.51.24: null #t3-tg1
-        sut:
-          hosts:
-            10.30.51.17: null #t1-sut1
-            10.30.51.18: null #t1-sut2
-            10.30.51.21: null #t2-sut1
-            10.30.51.22: null #t2-sut2
-            10.30.51.25: null #t3-sut1
-            10.30.51.26: null #t3-sut2
-        cobbler:
-          hosts:
-            10.30.51.28: null #s4-virl1
-    skylake:
-      children:
-        tg:
-          hosts:
-            10.30.51.45: null #s4-t21-tg1
-            10.30.51.48: null #s13-t31-tg1
-            10.30.51.49: null #s19-t33t34-tg1
-            10.30.51.53: null #s6-t22-tg1
-            10.30.51.55: null #s8-t23-tg1
-            10.30.51.57: null #s10-t24-tg1
-            10.30.51.60: null #s16-t32-tg1
-        sut:
-          hosts:
-            10.30.51.44: null #s3-t21-sut1
-            10.30.51.46: null #s11-t31-sut1
-            10.30.51.47: null #s12-t31-sut2
-            10.30.51.52: null #s5-t22-sut1
-            10.30.51.54: null #s7-t23-sut1
-            10.30.51.56: null #s9-t24-sut1
-            10.30.51.58: null #s14-t32-sut1
-            10.30.51.59: null #s15-t32-sut2
-        vpp_device:
-          hosts:
-            10.30.51.50: null #s1-t11-sut1
-            10.30.51.51: null #s2-t12-sut1
-    taishan:
-      children:
-#        tg:
-#          hosts:
-        sut:
-          hosts:
-            10.30.51.36: null #s17-t33-sut1
-            10.30.51.37: null #s18-t33-sut2
+    tg:
+      hosts:
+        10.30.51.16: #t1-tg1 - haswell
+        10.30.51.20: #t2-tg1 - haswell
+        10.30.51.24: #t3-tg1 - haswell
+        10.30.51.45: #s4-t21-tg1 - skylake
+        10.30.51.48: #s13-t31-tg1 - skylake
+        10.30.51.49: #s19-t33t34-tg1 - skylake
+        10.30.51.53: #s6-t22-tg1 - skylake
+        10.30.51.55: #s8-t23-tg1 - skylake
+        10.30.51.57: #s10-t24-tg1 - skylake
+        10.30.51.60: #s16-t32-tg1 - skylake
+        10.32.8.10: #s28-t26t35-tg1 - skylake
+        10.32.8.19: #s34-t27-tg1 - cascadelake
+        10.32.8.21: #s36-t28-tg1 - cascadelake
+        10.32.8.23: #s38-t29-tg1 - cascadelake
+        10.32.8.25: #s61-t210-tg1 - epyc
+    sut:
+      hosts:
+        10.30.51.17: #t1-sut1 - haswell
+        10.30.51.18: #t1-sut2 - haswell
+        10.30.51.21: #t2-sut1 - haswell
+        10.30.51.22: #t2-sut2 - haswell
+        10.30.51.25: #t3-sut1 - haswell
+        10.30.51.26: #t3-sut2 - haswell
+        10.30.51.36: #s17-t33-sut1 - taishan
+        10.30.51.37: #s18-t33-sut2 - taishan
+        10.30.51.44: #s3-t21-sut1 - skylake
+        10.30.51.46: #s11-t31-sut1 - skylake
+        10.30.51.47: #s12-t31-sut2 - skylake
+        10.30.51.52: #s5-t22-sut1 - skylake
+        10.30.51.54: #s7-t23-sut1 - skylake
+        10.30.51.56: #s9-t24-sut1 - skylake
+        10.30.51.58: #s14-t32-sut1 - skylake
+        10.30.51.59: #s15-t32-sut2 - 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.32.8.18: #s33-t27-sut1 - cascadelake
+        10.32.8.20: #s35-t28-sut1 - cascadelake
+        10.32.8.22: #s37-t29-sut1 - cascadelake
+        10.32.8.24: #s60-t210-sut1 - epyc
+        10.30.51.69: #s27-t34-sut1 - thunderx2 9975
+    vpp_device:
+      # Note: vpp_device hosts are also nomad client hosts
+      hosts:
+        10.30.51.50: #s1-t11-sut1 - skylake
+        10.30.51.51: #s2-t12-sut1 - skylake
+        10.30.51.70: #s55-t36-sut1 - thunderx2 9980
+        10.30.51.71: #s56-t37-sut1 - thunderx2 9980
+    nomad:
+      hosts:
+        10.30.51.28: #s41-nomad - haswell
+        10.30.51.29: #s39-nomad - haswell
+        10.30.51.30: #s40-nomad - haswell
+        10.30.51.32: #s42-nomad - ivy bridge
+        10.30.51.33: #s43-nomad - ivy bridge
+        10.30.51.34: #s44-nomad - ivy bridge
+        10.30.51.35: #s45-nomad - ivy bridge
+        10.32.8.14: #s46-nomad - skylake
+        10.32.8.15: #s47-nomad - skylake
+        10.32.8.16: #s48-nomad - skylake
+        10.32.8.17: #s57-nomad - 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
+    dev:
+      hosts:
+        10.30.51.38: #fdio-marvell-dev - thunderx 88xx