X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Ftestbed-setup%2FREADME.md;h=4550f5c59a0a7bbdf522412bcc8a48dd9c003f96;hp=e97fa22dfb95c1670c868c32ce58c956373fead1;hb=29f64252f7ad9d51e83cfbcd848d08848c5dc688;hpb=3a14297dca576dd7e2c9f09d84bf0f5cf58c1938

diff --git a/resources/tools/testbed-setup/README.md b/resources/tools/testbed-setup/README.md
index e97fa22dfb..4550f5c59a 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`
@@ -106,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: