CSIT-1068 Update testbed-setup for new server onboarding

Change-Id: I5e1588b432ebd5655a5451f8f19903f28d1fee2a
Signed-off-by: Peter Mikus <pmikus@cisco.com>

2 files changed, 102 insertions, 2 deletions

diff --git a/resources/tools/testbed-setup/pxe/dhcpd.conf b/resources/tools/testbed-setup/pxe/dhcpd.conf
index 25e6815962..ebc2620d30 100644
--- a/resources/tools/testbed-setup/pxe/dhcpd.conf
+++ b/resources/tools/testbed-setup/pxe/dhcpd.conf
@@ -87,4 +87,102 @@ subnet 10.30.51.0 netmask 255.255.255.0 {
     fixed-address 10.30.51.30;
     filename "pxelinux.0";
   }
-}
+# 2-Node Xeon
+  host s1-t21-sut1 {
+    hardware ethernet ac:1f:6b:8a:8c:76;
+    fixed-address 10.30.51.44;
+    filename "pxelinux.0";
+  }
+  host s2-t21-tg1 {
+    hardware ethernet ac:1f:6b:8a:8c:ea;
+    fixed-address 10.30.51.45;
+    filename "pxelinux.0";
+  }
+#  host s3-t22-sut1 {
+#    hardware ethernet 00:00:00:00:00:00;
+#    fixed-address 10.30.51.?;
+#    filename "pxelinux.0";
+#  }
+#  host s4-t22-tg1 {
+#    hardware ethernet 00:00:00:00:00:00;
+#    fixed-address 10.30.51.?;
+#    filename "pxelinux.0";
+#  }
+#  host s5-t23-sut1 {
+#    hardware ethernet 00:00:00:00:00:00;
+#    fixed-address 10.30.51.?;
+#    filename "pxelinux.0";
+#  }
+#  host s6-t23-tg1 {
+#    hardware ethernet 00:00:00:00:00:00;
+#    fixed-address 10.30.51.?;
+#    filename "pxelinux.0";
+#  }
+#  host s7-t24-sut1 {
+#    hardware ethernet 00:00:00:00:00:00;
+#    fixed-address 10.30.51.?;
+#    filename "pxelinux.0";
+#  }
+#  host s8-t24-tg1 {
+#    hardware ethernet 00:00:00:00:00:00;
+#    fixed-address 10.30.51.?;
+#    filename "pxelinux.0";
+#  }
+# 3-Node Xeon
+  host s9-t31-sut1 {
+    hardware ethernet ac:1f:6b:8a:8d:b6;
+    fixed-address 10.30.51.46;
+    filename "pxelinux.0";
+  }
+  host s10-t31-sut2 {
+    hardware ethernet ac:1f:6b:8a:8d:94;
+    fixed-address 10.30.51.47;
+    filename "pxelinux.0";
+  }
+  host s11-t31-tg1 {
+    hardware ethernet ac:1f:6b:8a:04:78;
+    fixed-address 10.30.51.48;
+    filename "pxelinux.0";
+  }
+#  host s12-t32-sut1 {
+#    hardware ethernet 00:00:00:00:00:00;
+#    fixed-address 10.30.50.?;
+#    filename "pxelinux.0";
+#  }
+#  host s13-t32-sut2 {
+#    hardware ethernet 00:00:00:00:00:00;
+#    fixed-address 10.30.50.?;
+#    filename "pxelinux.0";
+#  }
+#  host s14-t32-tg1 {
+#    hardware ethernet 00:00:00:00:00:00;
+#    fixed-address 10.30.50.?;
+#    filename "pxelinux.0";
+#  }
+# 3-Node Arm
+#  host s15-t33-sut1 {
+#    hardware ethernet 00:00:00:00:00:00;
+#    fixed-address 10.30.51.36;
+#    filename "ubuntu-installer/arm64/bootnetaa64.efi";
+#  }
+#  host s16-t33-sut2 {
+#    hardware ethernet 00:00:00:00:00:00;
+#    fixed-address 10.30.51.37;
+#    filename "ubuntu-installer/arm64/bootnetaa64.efi";
+#  }
+#  host s17-t33-tg1 {
+#    hardware ethernet 00:00:00:00:00:00;
+#    fixed-address 10.30.51.49;
+#    filename "pxelinux.0";
+#  }
+#  host s18-t34-sut1 {
+#    hardware ethernet 00:00:00:00:00:00;
+#    fixed-address 10.30.51.41;
+#    filename "ubuntu-installer/arm64/bootnetaa64.efi";
+#  }
+#  host s19-t34-sut2 {
+#    hardware ethernet 00:00:00:00:00:00;
+#    fixed-address 10.30.51.42;
+#    filename "ubuntu-installer/arm64/bootnetaa64.efi";
+#  }
+}
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/pxe/syslinux.cfg b/resources/tools/testbed-setup/pxe/syslinux.cfg
index 4038c1e9d2..f2cb1b0a4e 100644
--- a/resources/tools/testbed-setup/pxe/syslinux.cfg
+++ b/resources/tools/testbed-setup/pxe/syslinux.cfg
@@ -1,6 +1,8 @@
 # D-I config version 2.0
 serial 0 115200
+# search path for the c32 support libraries (libcom32, libutil etc.)
+path ubuntu-installer/amd64/boot-screens/
 include ubuntu-installer/amd64/boot-screens/menu.cfg
 default ubuntu-installer/amd64/boot-screens/vesamenu.c32
 prompt 0
-timeout 10 
+timeout 10