X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Ftestbed-setup%2Fansible%2Froles%2Ftg_sut%2Ftasks%2Fmain.yaml;h=39a401a7defb38f93529cb0a12ee71be927e72ec;hb=a9a3a18b4477e79d18f2f585a15b04de87f94abb;hp=eeaeed4ffbf804b43e3941ccc32c98238bdc5b4d;hpb=6f42dfbc805acae52adf7454cf213091d00141db;p=csit.git

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 eeaeed4ffb..39a401a7de 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,72 +1,61 @@
----
-# 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"'
-  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
-  raw: 'echo vfio-pci | sudo tee -a /etc/modules'
-  tags: load-vfio-pci
+---
+# file: roles/tg_sut/tasks/main.yaml
+
+- name: Install distribution - release - machine prerequisites
+  include_tasks: '{{ ansible_distribution|lower }}_{{ ansible_distribution_release }}.yaml'
+  tags: [ install-csit-dependencies, install-docker, install-kubernetes ]
+
+- name: Machine specifics
+  include_tasks: '{{ ansible_machine }}.yaml'
+  tags: [ disable-turbo-boost, set-grub, install-pip ]
+
+- 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 CSIT 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: Set ondemand service to disable
+  service:
+    name: 'ondemand'
+    enabled: 'no'
+  tags: set-ondemand
+
+- name: Install VPP PIP requirements
+  pip:
+    name:
+      - 'aenum==2.1.2'
+  tags: install-pip
+
+- name: Load vfio-pci by default
+  lineinfile:
+    path: '/etc/modules'
+    state: 'present'
+    line: 'vfio-pci'
+  tags: load-vfio-pci