aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2018-07-09 15:14:36 +0200
committerPeter Mikus <pmikus@cisco.com>2018-07-10 11:23:31 +0000
commit61ef529d33efd51acd1b1986c325d25a9d7ba705 (patch)
treecbb5ab397295053934160102dc62aea4d53da939 /resources
parent173a910c5f56106cd5aaa620ae0f9cfb94fcfac3 (diff)
Remove THIS tag and use unix endlines
The THIS tag has sneaked in 10Ge2P1X520-Eth-L2Xcbase-Eth-1Memif-1Dcr-Mrr but usually it is only to be used in draft testing. Not sure about the way non-unix endlines crept in. Is not git supposed to perform endline conversions on text files? Or are .robot, .rst, .yaml and .vat not recognized as text? Change-Id: Ia78cf942c05c3029c340a8639782786f37e57469 Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/templates/vat/memif_create.vat2
-rw-r--r--resources/templates/vat/nat/nat44_deterministic_forward.vat2
-rw-r--r--resources/templates/vat/nat/nat44_deterministic_reverse.vat2
-rw-r--r--resources/templates/vat/nat/nat44_set_deterministic.vat2
-rw-r--r--resources/templates/vat/nat/nat44_set_interfaces.vat2
-rw-r--r--resources/templates/vat/nat/nat_set_workers.vat2
-rw-r--r--resources/templates/vat/nat/nat_show_nat.vat2
-rw-r--r--resources/templates/vat/nat/snat_interface_dump.vat2
-rw-r--r--resources/templates/vat/show_memif.vat2
-rw-r--r--resources/tools/testbed-setup/ansible/production106
-rw-r--r--resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml92
-rw-r--r--resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_x86_64.yaml100
-rw-r--r--resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml28
-rw-r--r--resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_x86_64.yaml180
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml12
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu_x86_64.yaml18
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml202
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_x86_64.yaml364
-rw-r--r--resources/tools/testbed-setup/ansible/site.yaml28
-rw-r--r--resources/tools/testbed-setup/ansible/sut.yaml22
-rw-r--r--resources/tools/testbed-setup/ansible/tg.yaml22
-rw-r--r--resources/tools/testbed-setup/ansible/virl.yaml20
-rw-r--r--resources/tools/testbed-setup/ansible/vppdevice.yaml20
23 files changed, 616 insertions, 616 deletions
diff --git a/resources/templates/vat/memif_create.vat b/resources/templates/vat/memif_create.vat
index 1e9d0e8a6a..b20b3d7c52 100644
--- a/resources/templates/vat/memif_create.vat
+++ b/resources/templates/vat/memif_create.vat
@@ -1 +1 @@
-memif_create id {id} socket-id {socket} {role} rx-queues {rxq} tx-queues {txq}
+memif_create id {id} socket-id {socket} {role} rx-queues {rxq} tx-queues {txq}
diff --git a/resources/templates/vat/nat/nat44_deterministic_forward.vat b/resources/templates/vat/nat/nat44_deterministic_forward.vat
index a901398598..bcfcce961a 100644
--- a/resources/templates/vat/nat/nat44_deterministic_forward.vat
+++ b/resources/templates/vat/nat/nat44_deterministic_forward.vat
@@ -1 +1 @@
-exec nat44 deterministic forward {ip}
+exec nat44 deterministic forward {ip}
diff --git a/resources/templates/vat/nat/nat44_deterministic_reverse.vat b/resources/templates/vat/nat/nat44_deterministic_reverse.vat
index 614a2c0dfb..04ba8ba6dc 100644
--- a/resources/templates/vat/nat/nat44_deterministic_reverse.vat
+++ b/resources/templates/vat/nat/nat44_deterministic_reverse.vat
@@ -1 +1 @@
-exec nat44 deterministic reverse {ip}:{port}
+exec nat44 deterministic reverse {ip}:{port}
diff --git a/resources/templates/vat/nat/nat44_set_deterministic.vat b/resources/templates/vat/nat/nat44_set_deterministic.vat
index 39f3deeeb2..6141cce07c 100644
--- a/resources/templates/vat/nat/nat44_set_deterministic.vat
+++ b/resources/templates/vat/nat/nat44_set_deterministic.vat
@@ -1 +1 @@
-exec nat44 deterministic add in {ip_in}/{subnet_in} out {ip_out}/{subnet_out}
+exec nat44 deterministic add in {ip_in}/{subnet_in} out {ip_out}/{subnet_out}
diff --git a/resources/templates/vat/nat/nat44_set_interfaces.vat b/resources/templates/vat/nat/nat44_set_interfaces.vat
index f25961dbc2..3dab50b79e 100644
--- a/resources/templates/vat/nat/nat44_set_interfaces.vat
+++ b/resources/templates/vat/nat/nat44_set_interfaces.vat
@@ -1 +1 @@
-exec set interface nat44 in {int_in} out {int_out}
+exec set interface nat44 in {int_in} out {int_out}
diff --git a/resources/templates/vat/nat/nat_set_workers.vat b/resources/templates/vat/nat/nat_set_workers.vat
index 1a4d48979d..99fe68e4a2 100644
--- a/resources/templates/vat/nat/nat_set_workers.vat
+++ b/resources/templates/vat/nat/nat_set_workers.vat
@@ -1 +1 @@
-exec set nat workers {lcores}
+exec set nat workers {lcores}
diff --git a/resources/templates/vat/nat/nat_show_nat.vat b/resources/templates/vat/nat/nat_show_nat.vat
index 52f723280d..4fe01cb211 100644
--- a/resources/templates/vat/nat/nat_show_nat.vat
+++ b/resources/templates/vat/nat/nat_show_nat.vat
@@ -1 +1 @@
-exec show nat verbose
+exec show nat verbose
diff --git a/resources/templates/vat/nat/snat_interface_dump.vat b/resources/templates/vat/nat/snat_interface_dump.vat
index b80db63d82..37bc9d1853 100644
--- a/resources/templates/vat/nat/snat_interface_dump.vat
+++ b/resources/templates/vat/nat/snat_interface_dump.vat
@@ -1 +1 @@
-snat_interface_dump
+snat_interface_dump
diff --git a/resources/templates/vat/show_memif.vat b/resources/templates/vat/show_memif.vat
index 9c64260b11..4b6c14a8df 100644
--- a/resources/templates/vat/show_memif.vat
+++ b/resources/templates/vat/show_memif.vat
@@ -1 +1 @@
-exec show memif
+exec show memif
diff --git a/resources/tools/testbed-setup/ansible/production b/resources/tools/testbed-setup/ansible/production
index e1703afbcc..8e5ff62564 100644
--- a/resources/tools/testbed-setup/ansible/production
+++ b/resources/tools/testbed-setup/ansible/production
@@ -1,53 +1,53 @@
-all:
- children:
-# haswell:
-# children:
-# tg:
-# hosts:
-# 10.30.51.16: null #t1-tg1
-# 10.30.51.20: null #t2-tg1
-# 10.30.51.24: null #t3-tg1
-# sut:
-# hosts:
-# 10.30.51.17: null #t1-sut1
-# 10.30.51.18: null #t1-sut2
-# 10.30.51.21: null #t2-sut1
-# 10.30.51.22: null #t2-sut2
-# 10.30.51.25: null #t3-sut1
-# 10.30.51.26: null #t3-sut2
-# virl: # WARNING, DO NOT ENABLE VIRL UNLESS YOU KNOW WHAT YOU ARE DOING
-# hosts:
-# 10.30.51.28: null #t4-virl1
-# 10.30.51.29: null #t4-virl2
-# 10.30.51.30: null #t4-virl3
- skylake:
- children:
- tg:
- hosts:
- 10.30.51.45: null #s4-t21-tg1
- 10.30.51.48: null #s13-t31-tg1
- 10.30.51.49: null #s17-t33-tg1
- 10.30.51.53: null #s6-t22-tg1
- 10.30.51.55: null #s8-t23-tg1
- 10.30.51.57: null #s10-t24-tg1
- 10.30.51.60: null #s16-t32-tg1
- sut:
- hosts:
- 10.30.51.44: null #s3-t21-sut1
- 10.30.51.46: null #s11-t31-sut1
- 10.30.51.47: null #s12-t31-sut2
- 10.30.51.52: null #s5-t22-sut1
- 10.30.51.54: null #s7-t23-sut1
- 10.30.51.56: null #s9-t24-sut1
- 10.30.51.58: null #s14-t32-sut1
- 10.30.51.59: null #s15-t32-sut2
- vppdevice:
- hosts:
- 10.30.51.50: null #s1-t11-sut1
- 10.30.51.51: null #s2-t12-sut1
-# arm:
-# children:
-# tg:
-# hosts:
-# sut:
-# hosts:
+all:
+ children:
+# haswell:
+# children:
+# tg:
+# hosts:
+# 10.30.51.16: null #t1-tg1
+# 10.30.51.20: null #t2-tg1
+# 10.30.51.24: null #t3-tg1
+# sut:
+# hosts:
+# 10.30.51.17: null #t1-sut1
+# 10.30.51.18: null #t1-sut2
+# 10.30.51.21: null #t2-sut1
+# 10.30.51.22: null #t2-sut2
+# 10.30.51.25: null #t3-sut1
+# 10.30.51.26: null #t3-sut2
+# virl: # WARNING, DO NOT ENABLE VIRL UNLESS YOU KNOW WHAT YOU ARE DOING
+# hosts:
+# 10.30.51.28: null #t4-virl1
+# 10.30.51.29: null #t4-virl2
+# 10.30.51.30: null #t4-virl3
+ skylake:
+ children:
+ tg:
+ hosts:
+ 10.30.51.45: null #s4-t21-tg1
+ 10.30.51.48: null #s13-t31-tg1
+ 10.30.51.49: null #s17-t33-tg1
+ 10.30.51.53: null #s6-t22-tg1
+ 10.30.51.55: null #s8-t23-tg1
+ 10.30.51.57: null #s10-t24-tg1
+ 10.30.51.60: null #s16-t32-tg1
+ sut:
+ hosts:
+ 10.30.51.44: null #s3-t21-sut1
+ 10.30.51.46: null #s11-t31-sut1
+ 10.30.51.47: null #s12-t31-sut2
+ 10.30.51.52: null #s5-t22-sut1
+ 10.30.51.54: null #s7-t23-sut1
+ 10.30.51.56: null #s9-t24-sut1
+ 10.30.51.58: null #s14-t32-sut1
+ 10.30.51.59: null #s15-t32-sut2
+ vppdevice:
+ hosts:
+ 10.30.51.50: null #s1-t11-sut1
+ 10.30.51.51: null #s2-t12-sut1
+# arm:
+# children:
+# tg:
+# hosts:
+# sut:
+# hosts:
diff --git a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
index e16a6a7356..06058a427b 100644
--- a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
@@ -1,46 +1,46 @@
----
-# file: roles/common/tasks/main.yaml
-
-- name: Ubuntu specific
- import_tasks: ubuntu_x86_64.yaml
- when: ansible_distribution|lower == 'ubuntu' and ansible_machine == 'x86_64'
-
-- name: Set hostname
- hostname:
- name: '{{ hostname }}'
- tags: set-hostname
-
-- name: Ensure hostname is in /etc/hosts
- lineinfile:
- path: '/etc/hosts'
- regexp: '^{{ ansible_default_ipv4.address }}.+$'
- line: '{{ ansible_default_ipv4.address }} {{ hostname }}.linuxfoundation.org'
- tags: set-hostname
-
-- name: Set sudoers
- lineinfile:
- path: '/etc/sudoers'
- state: 'present'
- regexp: '^%admin ALL='
- line: '%admin ALL=(ALL) ALL'
- validate: '/usr/sbin/visudo -cf %s'
- tags: set-sudoers
-
-- name: Set sudoers
- lineinfile:
- path: '/etc/sudoers'
- state: 'present'
- regexp: '^%sudo'
- line: '%sudo ALL=(ALL:ALL) NOPASSWD: ALL'
- validate: '/usr/sbin/visudo -cf %s'
- tags: set-sudoers
-
-- name: Copy grub file
- template:
- src: 'files/grub'
- dest: '/etc/default/grub'
- owner: 'root'
- group: 'root'
- mode: '644'
- notify: ['Update GRUB']
- tags: copy-grub
+---
+# file: roles/common/tasks/main.yaml
+
+- name: Ubuntu specific
+ import_tasks: ubuntu_x86_64.yaml
+ when: ansible_distribution|lower == 'ubuntu' and ansible_machine == 'x86_64'
+
+- name: Set hostname
+ hostname:
+ name: '{{ hostname }}'
+ tags: set-hostname
+
+- name: Ensure hostname is in /etc/hosts
+ lineinfile:
+ path: '/etc/hosts'
+ regexp: '^{{ ansible_default_ipv4.address }}.+$'
+ line: '{{ ansible_default_ipv4.address }} {{ hostname }}.linuxfoundation.org'
+ tags: set-hostname
+
+- name: Set sudoers
+ lineinfile:
+ path: '/etc/sudoers'
+ state: 'present'
+ regexp: '^%admin ALL='
+ line: '%admin ALL=(ALL) ALL'
+ validate: '/usr/sbin/visudo -cf %s'
+ tags: set-sudoers
+
+- name: Set sudoers
+ lineinfile:
+ path: '/etc/sudoers'
+ state: 'present'
+ regexp: '^%sudo'
+ line: '%sudo ALL=(ALL:ALL) NOPASSWD: ALL'
+ validate: '/usr/sbin/visudo -cf %s'
+ tags: set-sudoers
+
+- name: Copy grub file
+ template:
+ src: 'files/grub'
+ dest: '/etc/default/grub'
+ owner: 'root'
+ group: 'root'
+ mode: '644'
+ notify: ['Update GRUB']
+ tags: copy-grub
diff --git a/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_x86_64.yaml b/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_x86_64.yaml
index d0f32a31cc..b6116c3690 100644
--- a/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_x86_64.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_x86_64.yaml
@@ -1,50 +1,50 @@
----
-# file: roles/common/tasks/ubuntu_x86_64.yaml
-
-- name: Copy apt sources file
- template:
- src: 'files/apt-sources.list'
- dest: '/etc/apt/sources.list'
- tags: copy-apt-sources
-
-- name: Install python-apt
- apt:
- name: 'python-apt'
- state: 'present'
- update_cache: True
- tags: install-python-apt
-
-- name: Install git
- apt:
- name: 'git'
- state: 'present'
- update_cache: True
- tags: install-git
-
-- name: Install crudini
- apt:
- name: 'crudini'
- state: 'present'
- update_cache: True
- tags: install-crudini
-
-- name: Install expect
- apt:
- name: 'expect'
- state: 'present'
- update_cache: True
- tags: install-expect
-
-- name: Install socat
- apt:
- name: 'socat'
- state: 'present'
- update_cache: True
- tags: install-socat
-
-- name: Install qemu
- apt:
- name: 'qemu-system-x86'
- state: 'present'
- update_cache: True
- tags: install-qemu
+---
+# file: roles/common/tasks/ubuntu_x86_64.yaml
+
+- name: Copy apt sources file
+ template:
+ src: 'files/apt-sources.list'
+ dest: '/etc/apt/sources.list'
+ tags: copy-apt-sources
+
+- name: Install python-apt
+ apt:
+ name: 'python-apt'
+ state: 'present'
+ update_cache: True
+ tags: install-python-apt
+
+- name: Install git
+ apt:
+ name: 'git'
+ state: 'present'
+ update_cache: True
+ tags: install-git
+
+- name: Install crudini
+ apt:
+ name: 'crudini'
+ state: 'present'
+ update_cache: True
+ tags: install-crudini
+
+- name: Install expect
+ apt:
+ name: 'expect'
+ state: 'present'
+ update_cache: True
+ tags: install-expect
+
+- name: Install socat
+ apt:
+ name: 'socat'
+ state: 'present'
+ update_cache: True
+ tags: install-socat
+
+- name: Install qemu
+ apt:
+ name: 'qemu-system-x86'
+ state: 'present'
+ update_cache: True
+ tags: install-qemu
diff --git a/resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml
index ffdbbcc860..0ecdcdba3b 100644
--- a/resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml
@@ -1,14 +1,14 @@
----
-# file: roles/sut/tasks/main.yaml
-
-- name: Ubuntu specific
- import_tasks: ubuntu_x86_64.yaml
- when: ansible_distribution|lower == 'ubuntu' and ansible_machine == 'x86_64'
-
-- name: Copy 80-vpp.conf
- file:
- src: '/dev/null'
- dest: '/etc/sysctl.d/80-vpp.conf'
- state: 'link'
- become: yes
- tags: copy-80-vpp
+---
+# file: roles/sut/tasks/main.yaml
+
+- name: Ubuntu specific
+ import_tasks: ubuntu_x86_64.yaml
+ when: ansible_distribution|lower == 'ubuntu' and ansible_machine == 'x86_64'
+
+- name: Copy 80-vpp.conf
+ file:
+ src: '/dev/null'
+ dest: '/etc/sysctl.d/80-vpp.conf'
+ state: 'link'
+ become: yes
+ tags: copy-80-vpp
diff --git a/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_x86_64.yaml b/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_x86_64.yaml
index f9ab901ded..6c9a839730 100644
--- a/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_x86_64.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_x86_64.yaml
@@ -1,90 +1,90 @@
----
-# file: roles/sut/tasks/ubuntu_x86_64.yaml
-
-- name: Install DKMS
- apt:
- name: 'dkms'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-dkms
-
-- name: Install pkg-config
- apt:
- name: 'pkg-config'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-pkg-config
-
-- name: Install libglib2.0-dev
- apt:
- name: 'libglib2.0-dev'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-libglib2.0-dev
-
-- name: Install autoconf
- apt:
- name: 'autoconf'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-autoconf
-
-- name: Install libtool
- apt:
- name: 'libtool'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-libtool
-
-- name: Install screen
- apt:
- name: 'screen'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-screen
-
-- name: Install libmbedcrypto1
- apt:
- name: 'libmbedcrypto1'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-libmbedcrypto1
-
-- name: Install libmbedtls10
- apt:
- name: 'libmbedtls10'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-libmbedtls10
-
-- name: Install libmbedx509-0
- apt:
- name: 'libmbedx509-0'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-libmbedx509-0
-
-- name: Install lxc
- apt:
- name: 'lxc'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-lxc
-
-- name: Install java
- apt:
- name: 'openjdk-8-jdk'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-java
+---
+# file: roles/sut/tasks/ubuntu_x86_64.yaml
+
+- name: Install DKMS
+ apt:
+ name: 'dkms'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-dkms
+
+- name: Install pkg-config
+ apt:
+ name: 'pkg-config'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-pkg-config
+
+- name: Install libglib2.0-dev
+ apt:
+ name: 'libglib2.0-dev'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-libglib2.0-dev
+
+- name: Install autoconf
+ apt:
+ name: 'autoconf'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-autoconf
+
+- name: Install libtool
+ apt:
+ name: 'libtool'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-libtool
+
+- name: Install screen
+ apt:
+ name: 'screen'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-screen
+
+- name: Install libmbedcrypto1
+ apt:
+ name: 'libmbedcrypto1'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-libmbedcrypto1
+
+- name: Install libmbedtls10
+ apt:
+ name: 'libmbedtls10'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-libmbedtls10
+
+- name: Install libmbedx509-0
+ apt:
+ name: 'libmbedx509-0'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-libmbedx509-0
+
+- name: Install lxc
+ apt:
+ name: 'lxc'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-lxc
+
+- name: Install java
+ apt:
+ name: 'openjdk-8-jdk'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-java
diff --git a/resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml
index 8e71800bca..54001a7272 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml
@@ -1,6 +1,6 @@
----
-# file: roles/tg/tasks/main.yaml
-
-- name: Ubuntu specific
- import_tasks: ubuntu_x86_64.yaml
- when: ansible_distribution|lower == 'ubuntu' and ansible_machine == 'x86_64'
+---
+# file: roles/tg/tasks/main.yaml
+
+- name: Ubuntu specific
+ import_tasks: ubuntu_x86_64.yaml
+ when: ansible_distribution|lower == 'ubuntu' and ansible_machine == 'x86_64'
diff --git a/resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu_x86_64.yaml b/resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu_x86_64.yaml
index 9711b2678d..54a04685e6 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu_x86_64.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu_x86_64.yaml
@@ -1,9 +1,9 @@
----
-# file: roles/tg/tasks/ubuntu_x86_64.yaml
-
-- name: Install Unzip
- apt:
- name: 'unzip'
- state: 'present'
- update_cache: True
- tags: install-unzip
+---
+# file: roles/tg/tasks/ubuntu_x86_64.yaml
+
+- name: Install Unzip
+ apt:
+ name: 'unzip'
+ state: 'present'
+ update_cache: True
+ tags: install-unzip
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml
index 1774134abe..ea779c07da 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml
@@ -1,101 +1,101 @@
----
-# file: roles/tg_sut/tasks/main.yaml
-
-- name: Ubuntu specific
- import_tasks: ubuntu_x86_64.yaml
- when: ansible_distribution|lower == 'ubuntu' and ansible_machine == 'x86_64'
-
-- name: Copy interfaces file
- template:
- src: 'files/interfaces_physical'
- dest: '/etc/network/interfaces'
- owner: 'root'
- group: 'root'
- mode: '0644'
- tags: copy-interface-file
-
-- name: Copy sysctl file
- template:
- src: 'files/90-csit'
- dest: '/etc/sysctl.d/90-csit.conf'
- owner: 'root'
- group: 'root'
- mode: '0644'
- tags: copy-90-csit
-
-- name: Copy IRQ load balancing file
- copy:
- src: 'files/irqbalance'
- dest: '/etc/default/irqbalance'
- owner: 'root'
- group: 'root'
- mode: '0644'
- tags: copy-irq
-
-- name: Copy cpufrequtils file
- copy:
- src: 'files/cpufrequtils'
- dest: '/etc/default/cpufrequtils'
- owner: 'root'
- group: 'root'
- mode: '0644'
- tags: copy-cpufrequtils
-
-- name: Copy Python requirements file
- copy:
- src: 'files/requirements.txt'
- dest: '/tmp/requirements.txt'
- tags: copy-pip
-
-- name: Set isolcpus and pstate parameter
- lineinfile:
- path: '/etc/default/grub'
- state: 'present'
- regexp: '^GRUB_CMDLINE_LINUX='
- line: 'GRUB_CMDLINE_LINUX="isolcpus={{ isolcpus }} nohz_full={{ isolcpus }} rcu_nocbs={{ isolcpus }} numa_balancing=disable intel_pstate=disable intel_iommu=on iommu=pt nmi_watchdog=0 audit=0 nosoftlockup processor.max_cstate=1 intel_idle.max_cstate=1 hpet=disable tsc=reliable mce=off"'
- notify: ['Update GRUB']
- tags: set-grub
-
-- name: Set ondemand service to disable
- service:
- name: 'ondemand'
- enabled: 'no'
- tags: set-ondemand
-
-- name: Install PIP requirements
- pip:
- requirements: '/tmp/requirements.txt'
- tags: install-pip
-
-- name: Load vfio-pci by default
- lineinfile:
- path: '/etc/modules'
- state: 'present'
- line: 'vfio-pci'
- tags: load-vfio-pci
-
-- name: Load msr by default
- lineinfile:
- path: '/etc/modules'
- state: 'present'
- line: 'msr'
- tags: disable-turbo-boost
-
-- name: Disable Turbo-Boost by service
- copy:
- src: 'files/disable-turbo-boost.service'
- dest: '/etc/systemd/system/disable-turbo-boost.service'
- owner: 'root'
- group: 'root'
- mode: '0644'
- when: >
- inventory_hostname in groups['skylake']
- tags: disable-turbo-boost
-
-- name: Disable Turbo-Boost by service on startup
- service:
- name: disable-turbo-boost
- enabled: yes
- when: >
- inventory_hostname in groups['skylake']
- tags: disable-turbo-boost
+---
+# file: roles/tg_sut/tasks/main.yaml
+
+- name: Ubuntu specific
+ import_tasks: ubuntu_x86_64.yaml
+ when: ansible_distribution|lower == 'ubuntu' and ansible_machine == 'x86_64'
+
+- name: Copy interfaces file
+ template:
+ src: 'files/interfaces_physical'
+ dest: '/etc/network/interfaces'
+ owner: 'root'
+ group: 'root'
+ mode: '0644'
+ tags: copy-interface-file
+
+- name: Copy sysctl file
+ template:
+ src: 'files/90-csit'
+ dest: '/etc/sysctl.d/90-csit.conf'
+ owner: 'root'
+ group: 'root'
+ mode: '0644'
+ tags: copy-90-csit
+
+- name: Copy IRQ load balancing file
+ copy:
+ src: 'files/irqbalance'
+ dest: '/etc/default/irqbalance'
+ owner: 'root'
+ group: 'root'
+ mode: '0644'
+ tags: copy-irq
+
+- name: Copy cpufrequtils file
+ copy:
+ src: 'files/cpufrequtils'
+ dest: '/etc/default/cpufrequtils'
+ owner: 'root'
+ group: 'root'
+ mode: '0644'
+ tags: copy-cpufrequtils
+
+- name: Copy Python requirements file
+ copy:
+ src: 'files/requirements.txt'
+ dest: '/tmp/requirements.txt'
+ tags: copy-pip
+
+- name: Set isolcpus and pstate parameter
+ lineinfile:
+ path: '/etc/default/grub'
+ state: 'present'
+ regexp: '^GRUB_CMDLINE_LINUX='
+ line: 'GRUB_CMDLINE_LINUX="isolcpus={{ isolcpus }} nohz_full={{ isolcpus }} rcu_nocbs={{ isolcpus }} numa_balancing=disable intel_pstate=disable intel_iommu=on iommu=pt nmi_watchdog=0 audit=0 nosoftlockup processor.max_cstate=1 intel_idle.max_cstate=1 hpet=disable tsc=reliable mce=off"'
+ notify: ['Update GRUB']
+ tags: set-grub
+
+- name: Set ondemand service to disable
+ service:
+ name: 'ondemand'
+ enabled: 'no'
+ tags: set-ondemand
+
+- name: Install PIP requirements
+ pip:
+ requirements: '/tmp/requirements.txt'
+ tags: install-pip
+
+- name: Load vfio-pci by default
+ lineinfile:
+ path: '/etc/modules'
+ state: 'present'
+ line: 'vfio-pci'
+ tags: load-vfio-pci
+
+- name: Load msr by default
+ lineinfile:
+ path: '/etc/modules'
+ state: 'present'
+ line: 'msr'
+ tags: disable-turbo-boost
+
+- name: Disable Turbo-Boost by service
+ copy:
+ src: 'files/disable-turbo-boost.service'
+ dest: '/etc/systemd/system/disable-turbo-boost.service'
+ owner: 'root'
+ group: 'root'
+ mode: '0644'
+ when: >
+ inventory_hostname in groups['skylake']
+ tags: disable-turbo-boost
+
+- name: Disable Turbo-Boost by service on startup
+ service:
+ name: disable-turbo-boost
+ enabled: yes
+ when: >
+ inventory_hostname in groups['skylake']
+ tags: disable-turbo-boost
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_x86_64.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_x86_64.yaml
index 3c6eb10d62..f43fad1326 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_x86_64.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_x86_64.yaml
@@ -1,182 +1,182 @@
----
-# file: roles/tg_sut/tasks/ubuntu_x86_64.yaml
-
-- name: Install python-dev
- apt:
- name: 'python-dev'
- state: 'present'
- update_cache: True
- tags: install-python-dev
-
-- name: Install python-virtualenv
- apt:
- name: 'python-virtualenv'
- state: 'present'
- update_cache: True
- tags: install-python-virtualenv
-
-- name: Install python pip
- apt:
- name: 'python-pip'
- state: 'present'
- update_cache: True
- tags: install-python-pip
-
-- name: Install libpcap-dev
- apt:
- name: 'libpcap-dev'
- state: 'present'
- update_cache: True
- tags: install-libpcap-dev
-
-- name: Install cpufrequtils
- apt:
- name: 'cpufrequtils'
- state: 'present'
- update_cache: True
- tags: install-cpufrequtils
-
-- name: Install cgroup-support
- apt:
- name: 'cgroup-bin'
- state: 'present'
- update_cache: True
- tags: install-cgroup-support
-
-- name: Install zlib1g-dev
- apt:
- name: 'zlib1g-dev'
- state: 'present'
- update_cache: True
- tags: install-zlib1g-dev
-
-- name: Install libnuma-dev
- apt:
- name: 'libnuma-dev'
- state: 'present'
- update_cache: True
- tags: install-libnuma-dev
-
-- name: Install Docker and role dependencies
- apt:
- name: "{{ item }}"
- state: "present"
- install_recommends: False
- with_items:
- - "apt-transport-https"
- - "ca-certificates"
- - "software-properties-common"
- - "cron"
- tags: install-docker
-
-- name: Install upstream APT GPG key
- apt_key:
- id: "{{ docker_apt_key }}"
- keyserver: "{{ ansible_local.core.keyserver
- if (ansible_local|d() and ansible_local.core|d() and
- ansible_local.core.keyserver)
- else 'hkp://pool.sks-keyservers.net' }}"
- state: "present"
- tags: install-docker
-
-- name: Install upstream APT repository
- apt_repository:
- repo: "{{ docker_repository }}"
- state: "present"
- update_cache: True
- tags: install-docker
-
-- name: Install Docker
- apt:
- name: "docker-{{ docker_edition }}={{ docker_apt_package_name }}"
- state: "present"
- update_cache: True
- install_recommends: False
- cache_valid_time: "{{ apt_cache_time }}"
- tags: install-docker
-
-- name: Remove Upstart config file
- file:
- path: "/etc/default/docker"
- state: "absent"
- tags: docker
-
-- name: Ensure systemd directory exists
- file:
- path: "/etc/systemd/system"
- state: "directory"
- owner: "root"
- group: "root"
- mode: "0755"
- tags: ensure-docker
-
-- name: Copy systemd unit file
- template:
- src: "templates/docker.service.j2"
- dest: "/etc/systemd/system/docker.service"
- owner: "root"
- group: "root"
- mode: "0644"
- register: docker_register_systemd_service
- tags: copy-docker
-
-- name: Reload systemd daemon
- command: "systemctl daemon-reload"
- notify: ["Restart Docker"]
- when: (docker_register_systemd_service and
- docker_register_systemd_service | changed)
- tags: restart-docker
-
-- name: Set specific users to "docker" group
- user:
- name: "{{ item }}"
- groups: "docker"
- append: True
- with_items: "{{ docker_users }}"
- when: docker_users
- tags: set-docker
-
-- name: Install upstream APT GPG key
- apt_key:
- id: "{{ kubernetes_apt_key }}"
- keyserver: "{{ ansible_local.core.keyserver
- if (ansible_local|d() and ansible_local.core|d() and
- ansible_local.core.keyserver)
- else 'hkp://pool.sks-keyservers.net' }}"
- state: "present"
- tags: install-kubernetes
-
-- name: Install upstream APT repository
- apt_repository:
- repo: "{{ kubernetes_repository }}"
- state: "present"
- update_cache: True
- tags: install-kubernetes
-
-- name: Install kubeadm
- apt:
- name: "kubeadm={{ kubernetes_apt_package_name }}"
- state: "present"
- update_cache: True
- install_recommends: False
- cache_valid_time: "{{ apt_cache_time }}"
- tags: install-kubernetes
-
-- name: Install kubectl
- apt:
- name: "kubectl={{ kubernetes_apt_package_name }}"
- state: "present"
- update_cache: True
- install_recommends: False
- cache_valid_time: "{{ apt_cache_time }}"
- tags: install-kubernetes
-
-- name: Install kubelet
- apt:
- name: "kubelet={{ kubernetes_apt_package_name }}"
- state: "present"
- update_cache: True
- install_recommends: False
- cache_valid_time: "{{ apt_cache_time }}"
- tags: install-kubernetes
-
+---
+# file: roles/tg_sut/tasks/ubuntu_x86_64.yaml
+
+- name: Install python-dev
+ apt:
+ name: 'python-dev'
+ state: 'present'
+ update_cache: True
+ tags: install-python-dev
+
+- name: Install python-virtualenv
+ apt:
+ name: 'python-virtualenv'
+ state: 'present'
+ update_cache: True
+ tags: install-python-virtualenv
+
+- name: Install python pip
+ apt:
+ name: 'python-pip'
+ state: 'present'
+ update_cache: True
+ tags: install-python-pip
+
+- name: Install libpcap-dev
+ apt:
+ name: 'libpcap-dev'
+ state: 'present'
+ update_cache: True
+ tags: install-libpcap-dev
+
+- name: Install cpufrequtils
+ apt:
+ name: 'cpufrequtils'
+ state: 'present'
+ update_cache: True
+ tags: install-cpufrequtils
+
+- name: Install cgroup-support
+ apt:
+ name: 'cgroup-bin'
+ state: 'present'
+ update_cache: True
+ tags: install-cgroup-support
+
+- name: Install zlib1g-dev
+ apt:
+ name: 'zlib1g-dev'
+ state: 'present'
+ update_cache: True
+ tags: install-zlib1g-dev
+
+- name: Install libnuma-dev
+ apt:
+ name: 'libnuma-dev'
+ state: 'present'
+ update_cache: True
+ tags: install-libnuma-dev
+
+- name: Install Docker and role dependencies
+ apt:
+ name: "{{ item }}"
+ state: "present"
+ install_recommends: False
+ with_items:
+ - "apt-transport-https"
+ - "ca-certificates"
+ - "software-properties-common"
+ - "cron"
+ tags: install-docker
+
+- name: Install upstream APT GPG key
+ apt_key:
+ id: "{{ docker_apt_key }}"
+ keyserver: "{{ ansible_local.core.keyserver
+ if (ansible_local|d() and ansible_local.core|d() and
+ ansible_local.core.keyserver)
+ else 'hkp://pool.sks-keyservers.net' }}"
+ state: "present"
+ tags: install-docker
+
+- name: Install upstream APT repository
+ apt_repository:
+ repo: "{{ docker_repository }}"
+ state: "present"
+ update_cache: True
+ tags: install-docker
+
+- name: Install Docker
+ apt:
+ name: "docker-{{ docker_edition }}={{ docker_apt_package_name }}"
+ state: "present"
+ update_cache: True
+ install_recommends: False
+ cache_valid_time: "{{ apt_cache_time }}"
+ tags: install-docker
+
+- name: Remove Upstart config file
+ file:
+ path: "/etc/default/docker"
+ state: "absent"
+ tags: docker
+
+- name: Ensure systemd directory exists
+ file:
+ path: "/etc/systemd/system"
+ state: "directory"
+ owner: "root"
+ group: "root"
+ mode: "0755"
+ tags: ensure-docker
+
+- name: Copy systemd unit file
+ template:
+ src: "templates/docker.service.j2"
+ dest: "/etc/systemd/system/docker.service"
+ owner: "root"
+ group: "root"
+ mode: "0644"
+ register: docker_register_systemd_service
+ tags: copy-docker
+
+- name: Reload systemd daemon
+ command: "systemctl daemon-reload"
+ notify: ["Restart Docker"]
+ when: (docker_register_systemd_service and
+ docker_register_systemd_service | changed)
+ tags: restart-docker
+
+- name: Set specific users to "docker" group
+ user:
+ name: "{{ item }}"
+ groups: "docker"
+ append: True
+ with_items: "{{ docker_users }}"
+ when: docker_users
+ tags: set-docker
+
+- name: Install upstream APT GPG key
+ apt_key:
+ id: "{{ kubernetes_apt_key }}"
+ keyserver: "{{ ansible_local.core.keyserver
+ if (ansible_local|d() and ansible_local.core|d() and
+ ansible_local.core.keyserver)
+ else 'hkp://pool.sks-keyservers.net' }}"
+ state: "present"
+ tags: install-kubernetes
+
+- name: Install upstream APT repository
+ apt_repository:
+ repo: "{{ kubernetes_repository }}"
+ state: "present"
+ update_cache: True
+ tags: install-kubernetes
+
+- name: Install kubeadm
+ apt:
+ name: "kubeadm={{ kubernetes_apt_package_name }}"
+ state: "present"
+ update_cache: True
+ install_recommends: False
+ cache_valid_time: "{{ apt_cache_time }}"
+ tags: install-kubernetes
+
+- name: Install kubectl
+ apt:
+ name: "kubectl={{ kubernetes_apt_package_name }}"
+ state: "present"
+ update_cache: True
+ install_recommends: False
+ cache_valid_time: "{{ apt_cache_time }}"
+ tags: install-kubernetes
+
+- name: Install kubelet
+ apt:
+ name: "kubelet={{ kubernetes_apt_package_name }}"
+ state: "present"
+ update_cache: True
+ install_recommends: False
+ cache_valid_time: "{{ apt_cache_time }}"
+ tags: install-kubernetes
+
diff --git a/resources/tools/testbed-setup/ansible/site.yaml b/resources/tools/testbed-setup/ansible/site.yaml
index 8eb0e01710..834ad51787 100644
--- a/resources/tools/testbed-setup/ansible/site.yaml
+++ b/resources/tools/testbed-setup/ansible/site.yaml
@@ -1,14 +1,14 @@
----
-# file: site.yaml
-
-- import_playbook: tg.yaml
- tags: tg
-
-- import_playbook: sut.yaml
- tags: sut
-
-- import_playbook: vppdevice.yaml
- tags: vppdevice
-
-#- import_playbook: virl.yaml
-# tags: virl
+---
+# file: site.yaml
+
+- import_playbook: tg.yaml
+ tags: tg
+
+- import_playbook: sut.yaml
+ tags: sut
+
+- import_playbook: vppdevice.yaml
+ tags: vppdevice
+
+#- import_playbook: virl.yaml
+# tags: virl
diff --git a/resources/tools/testbed-setup/ansible/sut.yaml b/resources/tools/testbed-setup/ansible/sut.yaml
index d178a02867..1f9a4cbaab 100644
--- a/resources/tools/testbed-setup/ansible/sut.yaml
+++ b/resources/tools/testbed-setup/ansible/sut.yaml
@@ -1,11 +1,11 @@
----
-# file: sut.yaml
-
-- hosts: sut
- remote_user: testuser
- become: yes
- become_user: root
- roles:
- - common
- - sut
- - tg_sut
+---
+# file: sut.yaml
+
+- hosts: sut
+ remote_user: testuser
+ become: yes
+ become_user: root
+ roles:
+ - common
+ - sut
+ - tg_sut
diff --git a/resources/tools/testbed-setup/ansible/tg.yaml b/resources/tools/testbed-setup/ansible/tg.yaml
index a524fddb99..a652dc5c80 100644
--- a/resources/tools/testbed-setup/ansible/tg.yaml
+++ b/resources/tools/testbed-setup/ansible/tg.yaml
@@ -1,11 +1,11 @@
----
-# file: tg.yaml
-
-- hosts: tg
- remote_user: testuser
- become: yes
- become_user: root
- roles:
- - common
- - tg
- - tg_sut
+---
+# file: tg.yaml
+
+- hosts: tg
+ remote_user: testuser
+ become: yes
+ become_user: root
+ roles:
+ - common
+ - tg
+ - tg_sut
diff --git a/resources/tools/testbed-setup/ansible/virl.yaml b/resources/tools/testbed-setup/ansible/virl.yaml
index 61f4bcefb0..5e57d585a4 100644
--- a/resources/tools/testbed-setup/ansible/virl.yaml
+++ b/resources/tools/testbed-setup/ansible/virl.yaml
@@ -1,10 +1,10 @@
----
-# file: virl.yaml
-
-- hosts: virl
- remote_user: testuser
- become: yes
- become_user: root
- roles:
- - common
- - virl
+---
+# file: virl.yaml
+
+- hosts: virl
+ remote_user: testuser
+ become: yes
+ become_user: root
+ roles:
+ - common
+ - virl
diff --git a/resources/tools/testbed-setup/ansible/vppdevice.yaml b/resources/tools/testbed-setup/ansible/vppdevice.yaml
index 03e61d3cb9..31912d92ff 100644
--- a/resources/tools/testbed-setup/ansible/vppdevice.yaml
+++ b/resources/tools/testbed-setup/ansible/vppdevice.yaml
@@ -1,10 +1,10 @@
----
-# file: vppdevice.yaml
-
-- hosts: vppdevice
- remote_user: testuser
- become: yes
- become_user: root
- roles:
- - common
- - vppdevice
+---
+# file: vppdevice.yaml
+
+- hosts: vppdevice
+ remote_user: testuser
+ become: yes
+ become_user: root
+ roles:
+ - common
+ - vppdevice