CSIT-1068 Update testbed-setup for new server onboarding

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

3 files changed, 113 insertions, 33 deletions

diff --git a/resources/tools/testbed-setup/README.md b/resources/tools/testbed-setup/README.md
index e97fa22dfb..7c4678320f 100644
--- a/resources/tools/testbed-setup/README.md
+++ b/resources/tools/testbed-setup/README.md
@@ -24,54 +24,34 @@ The process below assumes that there is a host used for boostrapping (referred
 to as "PXE boostrap server" below), and that the directory containig this README
 is available on the PXE bootstrap server in ~testuser/host-setup.
 
-### Prepare the PXE bootstrap server when there is no http server
+### Prepare the PXE bootstrap server when there is no http server AMD64
 
   - `sudo apt-get install isc-dhcp-server tftpd-hpa nginx-light ansible`
   - edit dhcpd.conf and place it to /etc/dhcp/
   - `sudo cp dhcpd.cfg /etc/dhcp/`
   - `sudo service isc-dhcp-server restart`
   - `cd ~testuser/host-setup`
-  - `wget 'http://releases.ubuntu.com/16.04.2/ubuntu-16.04.2-server-amd64.iso'`
   - `sudo mkdir /mnt/cdrom`
-  - `sudo mount -o loop ubuntu-16.04.2-server-amd64.iso /mnt/cdrom/`
+  - Ubuntu Xenial
+    - `wget 'http://releases.ubuntu.com/16.04.2/ubuntu-16.04.2-server-amd64.iso'`
+    - `sudo mount -o loop ubuntu-16.04.2-server-amd64.iso /mnt/cdrom/`
+  - Ubuntu Bionic
+    - `wget 'http://cdimage.ubuntu.com/ubuntu/releases/18.04/release/ubuntu-18.04-server-amd64.iso'`
+    - `sudo mount -o loop ubuntu-18.04-server-amd64.iso /mnt/cdrom/`
   - `sudo cp -r /mnt/cdrom/install/netboot/* /var/lib/tftpboot/`
   - figure out where nginx will look for files on the filesystem when
     responding to HTTP requests. The configuration is in one of the
     files in /etc/nginx/conf.d/, /etc/nginx/sites-enabled/ or in
-    /etc/nginx/nginx.conf under section server/root. Save the path to NGINX_ROOT
-  - `sudo mkdir -p ${NGINX_ROOT}/download/ubuntu`
-  - `sudo cp -r /mnt/cdrom/* ${NGINX_ROOT}/download/ubuntu/`
-  - `sudo cp /mnt/cdrom/ubuntu/isolinux/ldlinux.c32 /var/lib/tftpboot`
-  - `sudo cp /mnt/cdrom/ubuntu/isolinux/libcom32.c32 /var/lib/tftpboot`
-  - `sudo cp /mnt/cdrom/ubuntu/isolinux/libutil.c32 /var/lib/tftpboot`
-  - `sudo cp /mnt/cdrom/ubuntu/isolinux/chain.c32 /var/lib/tftpboot`
-  - `sudo umount /mnt/cdrom`
-  - edit ks.cfg and replace IP address with that of your PXE bootstrap server
-  - `sudo cp ks.cfg ${NGINX_ROOT}/download/ks.cfg`
-  - edit boot-screens_txt.cfg and replace IP address with that of your PXE bootstrap server
-  - `sudo cp boot-screens_txt.cfg /var/lib/tftpboot/ubuntu-installer/amd64/boot-screens/txt.cfg`
-  - `sudo cp syslinux.cfg /var/lib/tftpboot/ubuntu-installer/amd64/boot-screens/syslinux.cfg`
-
-### PREFERED: Prepare the PXE bootstrap server when an http server is already configured
-
-  - `sudo apt-get install isc-dhcp-server tftpd-hpa ansible`
-  - edit dhcpd.conf and place it to /etc/dhcp/
-  - `sudo cp dhcpd.cfg /etc/dhcp/`
-  - `sudo service isc-dhcp-server restart`
-  - `cd ~testuser/host-setup`
-  - `wget 'http://releases.ubuntu.com/16.04.2/ubuntu-16.04.2-server-amd64.iso'`
-  - `sudo mkdir /mnt/cdrom`
-  - `sudo mount -o loop ubuntu-16.04.1-server-amd64.iso /mnt/cdrom/`
-  - `sudo cp -r /mnt/cdrom/install/netboot/* /var/lib/tftpboot/`
-  - `sudo mkdir /var/www/download/ubuntu`
-  - `sudo cp -r /mnt/cdrom/* /var/www/download/ubuntu/`
+    /etc/nginx/nginx.conf under section server/root. Save the path to WWW_ROOT
+  - `sudo mkdir -p ${WWW_ROOT}/download/ubuntu`
+  - `sudo cp -r /mnt/cdrom/* ${WWW_ROOT}/download/ubuntu/`
   - `sudo cp /mnt/cdrom/ubuntu/isolinux/ldlinux.c32 /var/lib/tftpboot`
   - `sudo cp /mnt/cdrom/ubuntu/isolinux/libcom32.c32 /var/lib/tftpboot`
   - `sudo cp /mnt/cdrom/ubuntu/isolinux/libutil.c32 /var/lib/tftpboot`
   - `sudo cp /mnt/cdrom/ubuntu/isolinux/chain.c32 /var/lib/tftpboot`
   - `sudo umount /mnt/cdrom`
   - edit ks.cfg and replace IP address with that of your PXE bootstrap server and subdir in /var/www (in this case /download)
-  - `sudo cp ks.cfg /var/www/download/ks.cfg`
+  - `sudo cp ks.cfg ${WWW_ROOT}/download/ks.cfg`
   - edit boot-screens_txt.cfg and replace IP address with that of your PXE bootstrap server and subdir in /var/www (in this case /download)
   - `sudo cp boot-screens_txt.cfg /var/lib/tftpboot/ubuntu-installer/amd64/boot-screens/txt.cfg`
   - `sudo cp syslinux.cfg /var/lib/tftpboot/ubuntu-installer/amd64/boot-screens/syslinux.cfg`
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