X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Ftestbed-setup%2FREADME.md;h=d4e2091dfade79181b8377aff069ea609f6d3443;hp=e795a2e4fc9e6dd19f44d66c9fdc22ec75f19ebc;hb=eecad36d7d2275fa47fbcab40dbcf56108ab0a51;hpb=a7568a2eabf0872d25260c14ec084cb3d5ffb0f3

diff --git a/resources/tools/testbed-setup/README.md b/resources/tools/testbed-setup/README.md
index e795a2e4fc..d4e2091dfa 100644
--- a/resources/tools/testbed-setup/README.md
+++ b/resources/tools/testbed-setup/README.md
@@ -27,10 +27,13 @@ is available on the PXE bootstrap server in ~testuser/host-setup.
 ### Prepare the PXE bootstrap server (one-time)
 
   - `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.1/ubuntu-16.04.1-server-amd64.iso'`
+  - `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 mount -o loop ubuntu-16.04.2-server-amd64.iso /mnt/cdrom/`
   - `sudo cp -r /mnt/cdrom/install/netboot/* /var/lib/tftpboot/`
   - `sudo mkdir /usr/share/nginx/html/ubuntu`
   - `sudo cp -r /mnt/cdrom/* /usr/share/nginx/html/ubuntu/`
@@ -45,6 +48,30 @@ is available on the PXE bootstrap server in ~testuser/host-setup.
   - `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 (alternative way without NGINX)
+
+  - `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/`
+  - `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`
+  - 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`
+
 ### New testbed host - manual preparation
 
 - set CIMC address
@@ -75,7 +102,7 @@ While Ubuntu install is running:
 
 When installation is finished:
 
-  - `ssh-copy-id <>`
+  - `ssh-copy-id 10.30.51.x`
   - `cd ~testuser/host-setup/playbooks`
   - edit /etc/ansible/hosts; add the hosts you are installing. *REMOVE ANY HOSTS YOU ARE NOT CURRENTLY INSTALLING*.
 
@@ -93,7 +120,7 @@ When installation is finished:
 
     ~~~
     [virl]
-    10.30.51.28 hostname=t4-virl1 virl_l2_start=10.30.51.31 virl_l2_end=10.30.51.105
+    10.30.51.28 hostname=t4-virl1 virl_l2_start=10.30.52.2 virl_l2_end=10.30.52.253 virl_l2_network=10.30.52.0/24 virl_l2_ip=10.30.52.254 virl_public_port=eth0
     ~~~
 
   - `ansible-playbook --ask-sudo-pass 01-host-setup.yaml`