Update PXE info about new Skylake machines

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

4 files changed, 52 insertions, 35 deletions

diff --git a/resources/tools/testbed-setup/README.md b/resources/tools/testbed-setup/README.md
index 7c4678320f..4550f5c59a 100644
--- a/resources/tools/testbed-setup/README.md
+++ b/resources/tools/testbed-setup/README.md
@@ -86,7 +86,13 @@ Optional: If RAID is not created on Haswells. Execute while Ubuntu install is ru
   - Set the next boot from HDD (without restart)
   - `./cimc.py -u admin -p Cisco1234 $CIMC_ADDRESS -d -hdd`
 
-Optional: If installing Skylake machine, connect to IPMI and boot from PXE via F12
+Optional: If installing Skylake machine
+
+    - Get MAC address of LAN0
+    - `ipmitool -U ADMIN -H $HOST_ADDRESS raw 0x30 0x21 | tail -c 18`
+    - Reboot into PXE for next boot only
+    - `ipmitool -I lanplus -H $HOST_ADDRESS -U ADMIN chassis bootdev pxe`
+
 
 When installation is finished:
 
diff --git a/resources/tools/testbed-setup/ansible/site.yaml b/resources/tools/testbed-setup/ansible/site.yaml
index 45808e53b0..8eb0e01710 100644
--- a/resources/tools/testbed-setup/ansible/site.yaml
+++ b/resources/tools/testbed-setup/ansible/site.yaml
@@ -10,5 +10,5 @@
 - import_playbook: vppdevice.yaml

   tags: vppdevice

 

-- import_playbook: virl.yaml

-  tags: virl

+#- import_playbook: virl.yaml

+#  tags: virl

diff --git a/resources/tools/testbed-setup/pxe/dhcpd.conf b/resources/tools/testbed-setup/pxe/dhcpd.conf
index b22aff7dd8..17c0bbccb1 100644
--- a/resources/tools/testbed-setup/pxe/dhcpd.conf
+++ b/resources/tools/testbed-setup/pxe/dhcpd.conf
@@ -87,78 +87,89 @@ subnet 10.30.51.0 netmask 255.255.255.0 {
     fixed-address 10.30.51.30;
     filename "pxelinux.0";
   }
+# 1-Node Xeon
+  host s1-t11-sut1 {
+    hardware ethernet ac:1f:6b:8a:8c:76;
+    fixed-address 10.30.51.50;
+    filename "pxelinux.0";
+  }
+  host s2-t12-sut1 {
+    hardware ethernet ac:1f:6b:8a:8c:ea;
+    fixed-address 10.30.51.51;
+    filename "pxelinux.0";
+  }
 # 2-Node Xeon
   host s3-t21-sut1 {
-    hardware ethernet ac:1f:6b:8a:8c:76;
+    hardware ethernet ac:1f:6b:8a:8d:b6;
     fixed-address 10.30.51.44;
     filename "pxelinux.0";
   }
   host s4-t21-tg1 {
-    hardware ethernet ac:1f:6b:8a:8c:ea;
+    hardware ethernet ac:1f:6b:8a:8d:94;
     fixed-address 10.30.51.45;
     filename "pxelinux.0";
   }
   host s5-t22-sut1 {
-    hardware ethernet 00:00:00:00:00:00;
+    hardware ethernet ac:1f:6b:8a:04:78;
     fixed-address 10.30.51.52;
     filename "pxelinux.0";
   }
   host s6-t22-tg1 {
-    hardware ethernet 00:00:00:00:00:00;
+    hardware ethernet ac:1f:6b:8a:06:80;
     fixed-address 10.30.51.53;
     filename "pxelinux.0";
   }
   host s7-t23-sut1 {
-    hardware ethernet 00:00:00:00:00:00;
+    hardware ethernet ac:1f:6b:8b:52:b4;
     fixed-address 10.30.51.54;
     filename "pxelinux.0";
   }
   host s8-t23-tg1 {
-    hardware ethernet 00:00:00:00:00:00;
+    hardware ethernet ac:1f:6b:8b:56:8c;
     fixed-address 10.30.51.55;
     filename "pxelinux.0";
   }
   host s9-t24-sut1 {
-    hardware ethernet 00:00:00:00:00:00;
+    hardware ethernet ac:1f:6b:8b:55:d8;
     fixed-address 10.30.51.56;
     filename "pxelinux.0";
   }
   host s10-t24-tg1 {
-    hardware ethernet 00:00:00:00:00:00;
+    hardware ethernet ac:1f:6b:8a:8d:0a;
     fixed-address 10.30.51.57;
     filename "pxelinux.0";
   }
 # 3-Node Xeon
   host s11-t31-sut1 {
-    hardware ethernet ac:1f:6b:8a:8d:b6;
+    hardware ethernet ac:1f:6b:8b:54:c4;
     fixed-address 10.30.51.46;
     filename "pxelinux.0";
   }
   host s12-t31-sut2 {
-    hardware ethernet ac:1f:6b:8a:8d:94;
+    hardware ethernet ac:1f:6b:8b:56:b6;
     fixed-address 10.30.51.47;
     filename "pxelinux.0";
   }
   host s13-t31-tg1 {
-    hardware ethernet ac:1f:6b:8a:04:78;
+    hardware ethernet ac:1f:6b:8b:55:78;
     fixed-address 10.30.51.48;
     filename "pxelinux.0";
   }
-  host s14-t32-sut1 {
-    hardware ethernet 00:00:00:00:00:00;
-    fixed-address 10.30.51.58;
-    filename "pxelinux.0";
-  }
-  host s15-t32-sut2 {
-    hardware ethernet 00:00:00:00:00:00;
-    fixed-address 10.30.51.59;
-    filename "pxelinux.0";
-  }
-  host s16-t32-tg1 {
-    hardware ethernet 00:00:00:00:00:00;
-    fixed-address 10.30.51.60;
-    filename "pxelinux.0";
-  }
+#  host s14-t32-sut1 {
+#    hardware ethernet 00:00:00:00:00:00;
+#    fixed-address 10.30.51.58;
+#    filename "pxelinux.0";
+#  }
+#  host s15-t32-sut2 {
+#    hardware ethernet 00:00:00:00:00:00;
+#    fixed-address 10.30.51.59;
+#    filename "pxelinux.0";
+#  }
+#  host s16-t32-tg1 {
+#    hardware ethernet 00:00:00:00:00:00;
+#    fixed-address 10.30.51.60;
+#    filename "pxelinux.0";
+#  }
 # 3-Node Arm
 #  host s15-t33-sut1 {
 #    hardware ethernet 00:00:00:00:00:00;
@@ -170,11 +181,11 @@ subnet 10.30.51.0 netmask 255.255.255.0 {
 #    fixed-address 10.30.51.37;
 #    filename "ubuntu-installer/arm64/bootnetaa64.efi";
 #  }
-  host s17-t33-tg1 {
-    hardware ethernet ac:1f:6b:8a:06:80;
-    fixed-address 10.30.51.49;
-    filename "pxelinux.0";
-  }
+#  host s19-t33t34-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;
diff --git a/resources/tools/testbed-setup/pxe/ks.cfg b/resources/tools/testbed-setup/pxe/ks.cfg
index a027b950ab..7f44a89f66 100644
--- a/resources/tools/testbed-setup/pxe/ks.cfg
+++ b/resources/tools/testbed-setup/pxe/ks.cfg
@@ -22,7 +22,7 @@ timezone America/Los_Angeles
 rootpw --disabled
 
 #Initial user (user with sudo capabilities)
-user testuser --fullname "Test User" --password Cisco1234
+user testuser --fullname "Test User" --password Csit1234
 
 #Reboot after installation
 reboot