diff options
Diffstat (limited to 'resources/tools/testbed-setup')
12 files changed, 147 insertions, 17 deletions
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.17.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.17.yaml new file mode 100644 index 0000000000..88ebbfccf6 --- /dev/null +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.17.yaml @@ -0,0 +1,18 @@ +--- +# file: host_vars/10.32.8.17.yaml + +hostname: "s32-t14-sut1" +grub: + isolcpus: "1-27,29-55,57-83,85-111" + nohz_full: "1-27,29-55,57-83,85-111" + rcu_nocbs: "1-27,29-55,57-83,85-111" +sysctl: + kernel: + watchdog_cpumask: "0,28,56,84" + vm: + nr_hugepages: 65536 + max_map_count: 20000 + +inventory_ipmi_hostname: '10.30.55.17' +cobbler_profile: 'ubuntu-18.04.2-server-x86_64' +cpu_microarchitecture: "cascadelake" diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml new file mode 100644 index 0000000000..84da961557 --- /dev/null +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml @@ -0,0 +1,18 @@ +--- +# file: host_vars/10.32.8.18.yaml + +hostname: "s33-t27-sut1" +grub: + isolcpus: "1-23,25-47,49-71,73-95" + nohz_full: "1-23,25-47,49-71,73-95" + rcu_nocbs: "1-23,25-47,49-71,73-95" +sysctl: + kernel: + watchdog_cpumask: "0,24,48,72" + vm: + nr_hugepages: 65536 + max_map_count: 20000 + +inventory_ipmi_hostname: '10.30.55.18' +cobbler_profile: 'ubuntu-18.04.2-server-x86_64' +cpu_microarchitecture: "cascadelake" diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml new file mode 100644 index 0000000000..e641f184d6 --- /dev/null +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml @@ -0,0 +1,18 @@ +--- +# file: host_vars/10.32.8.19.yaml + +hostname: "s34-t27-tg1" +grub: + isolcpus: "1-27,29-55,57-83,85-111" + nohz_full: "1-27,29-55,57-83,85-111" + rcu_nocbs: "1-27,29-55,57-83,85-111" +sysctl: + kernel: + watchdog_cpumask: "0,28,56,84" + vm: + nr_hugepages: 4096 + max_map_count: 20000 + +inventory_ipmi_hostname: '10.30.55.19' +cobbler_profile: 'ubuntu-18.04.2-server-x86_64' +cpu_microarchitecture: "cascadelake" diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml new file mode 100644 index 0000000000..52a48be962 --- /dev/null +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml @@ -0,0 +1,18 @@ +--- +# file: host_vars/10.32.8.20.yaml + +hostname: "s35-t28-sut1" +grub: + isolcpus: "1-23,25-47,49-71,73-95" + nohz_full: "1-23,25-47,49-71,73-95" + rcu_nocbs: "1-23,25-47,49-71,73-95" +sysctl: + kernel: + watchdog_cpumask: "0,24,48,72" + vm: + nr_hugepages: 65536 + max_map_count: 20000 + +inventory_ipmi_hostname: '10.30.55.20' +cobbler_profile: 'ubuntu-18.04.2-server-x86_64' +cpu_microarchitecture: "cascadelake" diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml new file mode 100644 index 0000000000..1543052eed --- /dev/null +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml @@ -0,0 +1,18 @@ +--- +# file: host_vars/10.32.8.21.yaml + +hostname: "s36-t28-tg1" +grub: + isolcpus: "1-27,29-55,57-83,85-111" + nohz_full: "1-27,29-55,57-83,85-111" + rcu_nocbs: "1-27,29-55,57-83,85-111" +sysctl: + kernel: + watchdog_cpumask: "0,28,56,84" + vm: + nr_hugepages: 4096 + max_map_count: 20000 + +inventory_ipmi_hostname: '10.30.55.21' +cobbler_profile: 'ubuntu-18.04.2-server-x86_64' +cpu_microarchitecture: "cascadelake" diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml new file mode 100644 index 0000000000..681912dc41 --- /dev/null +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml @@ -0,0 +1,18 @@ +--- +# file: host_vars/10.32.8.22.yaml + +hostname: "s37-t29-sut1" +grub: + isolcpus: "1-23,25-47,49-71,73-95" + nohz_full: "1-23,25-47,49-71,73-95" + rcu_nocbs: "1-23,25-47,49-71,73-95" +sysctl: + kernel: + watchdog_cpumask: "0,24,48,72" + vm: + nr_hugepages: 65536 + max_map_count: 20000 + +inventory_ipmi_hostname: '10.30.55.22' +cobbler_profile: 'ubuntu-18.04.2-server-x86_64' +cpu_microarchitecture: "cascadelake" diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml new file mode 100644 index 0000000000..186944f9a3 --- /dev/null +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml @@ -0,0 +1,18 @@ +--- +# file: host_vars/10.32.8.23.yaml + +hostname: "s38-t29-tg1" +grub: + isolcpus: "1-27,29-55,57-83,85-111" + nohz_full: "1-27,29-55,57-83,85-111" + rcu_nocbs: "1-27,29-55,57-83,85-111" +sysctl: + kernel: + watchdog_cpumask: "0,28,56,84" + vm: + nr_hugepages: 4096 + max_map_count: 20000 + +inventory_ipmi_hostname: '10.30.55.23' +cobbler_profile: 'ubuntu-18.04.2-server-x86_64' +cpu_microarchitecture: "cascadelake" diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts index af29bea2d2..fe15007370 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts @@ -13,6 +13,9 @@ all: 10.30.51.57: #s10-t24-tg1 - skylake 10.30.51.60: #s16-t32-tg1 - skylake 10.32.8.10: #s28-t26t35-tg1 - skylake + 10.32.8.19: #s34-t27-tg1 - cascadelake + 10.32.8.21: #s36-t28-tg1 - cascadelake + 10.32.8.23: #s38-t29-tg1 - cascadelake sut: hosts: 10.30.51.17: #t1-sut1 - haswell @@ -34,7 +37,10 @@ all: 10.32.8.11: #s29-t26-sut1 - denverton 10.32.8.12: #s30-t35-sut1 - denverton 10.32.8.13: #s31-t35-sut2 - denverton - + 10.32.8.17: #s32-t14-sut1 - cascadelake + 10.32.8.18: #s33-t27-sut1 - cascadelake + 10.32.8.20: #s35-t28-sut1 - cascadelake + 10.32.8.22: #s37-t29-sut1 - cascadelake vpp_device: hosts: 10.30.51.50: #s1-t11-sut1 - skylake diff --git a/resources/tools/testbed-setup/ansible/inventories/sample_inventory/hosts b/resources/tools/testbed-setup/ansible/inventories/sample_inventory/hosts index da5d7f1634..e8e1439db4 100644 --- a/resources/tools/testbed-setup/ansible/inventories/sample_inventory/hosts +++ b/resources/tools/testbed-setup/ansible/inventories/sample_inventory/hosts @@ -1,11 +1,9 @@ all: children: - skylake: # Architecture: (options) skylake, haswell, taishan... - children: - tg: - hosts: - 1.1.1.1: null #t1-tg - sut: - hosts: - 2.2.2.2: null #t1-sut1 - 3.3.3.3: null #t1-sut2 + tg: + hosts: + 1.1.1.1: #t1-tg + sut: + hosts: + 2.2.2.2: #t1-sut1 + 3.3.3.3: #t1-sut2 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 7f74beec51..a2d2c2061a 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 @@ -9,9 +9,9 @@ include_tasks: '{{ ansible_machine }}.yaml' tags: [ disable-turbo-boost, set-grub, install-pip ] -- name: Skylake specific - import_tasks: skylake.yaml - when: cpu_microarchitecture == "skylake" +- name: Turbo boost specific + import_tasks: turbo_boost.yaml + when: cpu_microarchitecture == "skylake" or cpu_microarchitecture == "cascadelake" tags: [ install-msr, disable-turbo-boost ] - name: Copy netplan network config file diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/skylake.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/turbo_boost.yaml index 33e061e724..1002792aa8 100644 --- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/skylake.yaml +++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/turbo_boost.yaml @@ -1,5 +1,5 @@ --- -# file: roles/tg_sut/tasks/skylake.yaml +# file: roles/tg_sut/tasks/turbo_boost.yaml - name: Install msr-tools apt: @@ -9,7 +9,7 @@ install_recommends: False tags: install-msr -- name: Disable Skylake Turbo-Boost by service +- name: Disable Turbo-Boost by service copy: src: 'files/disable-turbo-boost.service' dest: '/etc/systemd/system/disable-turbo-boost.service' @@ -18,7 +18,7 @@ mode: '0644' tags: disable-turbo-boost -- name: Disable Skylake Turbo-Boost by service on startup +- name: Disable Turbo-Boost by service on startup service: name: disable-turbo-boost enabled: yes diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml index 6e8dee6cf1..a8c2266201 100644 --- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml +++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml @@ -5,7 +5,7 @@ apt: name: - 'python-dev' - - 'python-virtualenv' + - 'virtualenv' - 'python-pip' - 'libpcap-dev' - 'cpufrequtils' |