3n-tsh timeout, testbed tags and ansible update

[csit.git] / resources / tools / testbed-setup / ansible / roles / sut / tasks / main.yaml

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 f5a2dd8..a882001 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml
@@ -1,13 +1,9 @@
 ---
 # file: roles/sut/tasks/main.yaml
 
-- name: Ubuntu specific
-  import_tasks: ubuntu.yaml
-  when: ansible_distribution|lower == 'ubuntu'
-
-- name: Taishan aarch64 specific
-  import_tasks: taishan_workaround.yaml
-  when: taishan_workaround is defined
+- name: Install distribution - release - machine prerequisites
+  include_tasks: '{{ ansible_distribution|lower }}_{{ ansible_distribution_release }}.yaml'
+  tags: [ install-csit-dependencies, install-kernel-image ]
 
 - name: Copy 80-vpp.conf
   file:
@@ -16,3 +12,7 @@
     state: 'link'
   become: yes
   tags: copy-80-vpp
+
+- name: Install DPDK
+  include_tasks: 'dpdk.yaml'
+  tags: install-dpdk