aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--resources/tools/testbed-setup/README.md4
-rw-r--r--resources/tools/testbed-setup/boot-screens_txt.cfg2
-rw-r--r--resources/tools/testbed-setup/ks.cfg4
-rw-r--r--resources/tools/testbed-setup/playbooks/01-host-setup.yaml46
4 files changed, 27 insertions, 29 deletions
diff --git a/resources/tools/testbed-setup/README.md b/resources/tools/testbed-setup/README.md
index 4453d767e4..d4e2091dfa 100644
--- a/resources/tools/testbed-setup/README.md
+++ b/resources/tools/testbed-setup/README.md
@@ -48,7 +48,7 @@ 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`
-### Prepare the PXE bootstrap server (alternative way without NGINX)
+### 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/
@@ -102,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*.
diff --git a/resources/tools/testbed-setup/boot-screens_txt.cfg b/resources/tools/testbed-setup/boot-screens_txt.cfg
index 8736116c1e..4c73de3855 100644
--- a/resources/tools/testbed-setup/boot-screens_txt.cfg
+++ b/resources/tools/testbed-setup/boot-screens_txt.cfg
@@ -3,7 +3,7 @@ label install
menu label ^Install
menu default
kernel ubuntu-installer/amd64/linux
- append ks=http://10.30.51.28/ks.cfg ksdevice=bootif initrd=ubuntu-installer/amd64/initrd.gz console=tty0 console=ttyS0,115200n8 --- quiet
+ append ks=http://10.30.51.28/download/ks.cfg ksdevice=bootif initrd=ubuntu-installer/amd64/initrd.gz console=tty0 console=ttyS0,115200n8 --- quiet
IPAPPEND 2
label cli
menu label ^Command-line install
diff --git a/resources/tools/testbed-setup/ks.cfg b/resources/tools/testbed-setup/ks.cfg
index e98509be4c..a027b950ab 100644
--- a/resources/tools/testbed-setup/ks.cfg
+++ b/resources/tools/testbed-setup/ks.cfg
@@ -36,7 +36,7 @@ install
#Installation media
#cdrom
#nfs --server=server.com --dir=/path/to/ubuntu/
-url --url http://10.30.51.28/ubuntu
+url --url http://10.30.51.28/download/ubuntu
#System bootloader configuration
bootloader --location=mbr
@@ -73,7 +73,7 @@ skipx
###
-preseed live-installer/net-image string http://10.30.51.28/ubuntu/install/filesystem.squashfs
+preseed live-installer/net-image string http://10.30.51.28/download/ubuntu/install/filesystem.squashfs
preseed user-setup/allow-password-weak boolean true
diff --git a/resources/tools/testbed-setup/playbooks/01-host-setup.yaml b/resources/tools/testbed-setup/playbooks/01-host-setup.yaml
index fb9b516b6d..6d644e5054 100644
--- a/resources/tools/testbed-setup/playbooks/01-host-setup.yaml
+++ b/resources/tools/testbed-setup/playbooks/01-host-setup.yaml
@@ -31,10 +31,6 @@
apt: name=socat state=present
- name: install qemu
apt: name=qemu-system-x86 state=present
- - name: Old interface naming
- command: ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
- - name: update init for old interface naming
- command: update-initramfs -u
- hosts: virl
remote_user: testuser
sudo: yes
@@ -47,26 +43,28 @@
copy: src=files/ifup dest=/etc/network/if-up.d/virl owner=root group=root mode=755
- name: Set VIRL user authorized key
authorized_key: user=virl key="{{ lookup('file', '/home/testuser/.ssh/id_rsa.pub') }}"
- - cron:
- name: QEMU log garbage collector
- minute: 0
- hour: 0
- job: "find /var/log/libvirt/qemu -type f -mtime +14 -name 'instance*.log' -delete"
- - cron:
- name: VPP deb package garbage collector
- minute: 0
- hour: 0
- job: "find /tmp -type f -atime +14 -name '*.deb' -delete"
- - cron:
- name: VPP rpm package garbage collector
- minute: 0
- hour: 0
- job: "find /tmp -type f -atime +14 -name '*.rpm' -delete"
- - cron:
- name: NFS scratch dir garbage collector
- minute: 0
- hour: 0
- job: "find /nfs/scratch/ -type d -mtime +1 -name 'session-*' -exec rm -r "{}" \;"
+ - name: install bridge-utils
+ apt: name=bridge-utils state=present
+ - name: Old interface naming
+ command: ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
+ - name: update init for old interface naming
+ command: update-initramfs -u
+ - name: QEMU log garbage collector
+ cron: minute="0" hour="0"
+ name="QEMU log garbage collector"
+ job="find /var/log/libvirt/qemu -type f -mtime +14 -name 'instance*.log' -delete"
+ - name: VPP deb package garbage collector
+ cron: minute="0" hour="0"
+ name="VPP deb package garbage collector"
+ job="find /tmp -type f -atime +14 -name '*.deb' -delete"
+ - name: VPP rpm package garbage collector
+ cron: minute="0" hour="0"
+ name="VPP rpm package garbage collector"
+ job="find /tmp -type f -atime +14 -name '*.rpm' -delete"
+ - name: NFS scratch dir garbage collector
+ cron: minute="0" hour="0"
+ name="NFS scratch dir garbage collector"
+ job="find /nfs/scratch/ -type d -mtime +1 -name 'session-*' -exec rm -r '{}' \\;"
- hosts: tg:sut
remote_user: testuser
sudo: yes