aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools/testbed-setup/ansible/roles/sut/tasks
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2019-03-14 08:02:56 +0000
committerPeter Mikus <pmikus@cisco.com>2019-03-14 08:52:08 +0000
commitbf3ce71ec5074eb30a866ea8b6e01aad03d58e64 (patch)
treebd2fbf852a42ac41dd6b9e5df378f2f72474a0e3 /resources/tools/testbed-setup/ansible/roles/sut/tasks
parentb285fff289f434f0aa988d282a218a9f84e21357 (diff)
Add PAPI dependencies
+ Various small structure optmizations Change-Id: I1aac9353f72436de53797fc734bef498905c8189 Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/tools/testbed-setup/ansible/roles/sut/tasks')
-rw-r--r--resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml5
-rw-r--r--resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_bionic.yaml (renamed from resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu.yaml)5
2 files changed, 6 insertions, 4 deletions
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 f5a2dd86ad..90990b6c3b 100644
--- a/resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml
@@ -1,9 +1,8 @@
---
# file: roles/sut/tasks/main.yaml
-- name: Ubuntu specific
- import_tasks: ubuntu.yaml
- when: ansible_distribution|lower == 'ubuntu'
+- name: Install distribution - release - machine prerequisites
+ include_tasks: '{{ ansible_distribution|lower }}_{{ ansible_distribution_release }}.yaml'
- name: Taishan aarch64 specific
import_tasks: taishan_workaround.yaml
diff --git a/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu.yaml b/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_bionic.yaml
index 69ca52916e..7ed9daed22 100644
--- a/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_bionic.yaml
@@ -1,5 +1,5 @@
---
-# file: roles/sut/tasks/ubuntu.yaml
+# file: roles/sut/tasks/ubuntu_bionic.yaml
- name: Install CSIT dependencies
apt:
@@ -20,4 +20,7 @@
- 'openjdk-8-jdk'
- 'libpixman-1-dev'
- 'python-cffi'
+ - 'python-cffi-backend'
+ - 'python3-cffi'
+ - 'python3-cffi-backend'
tags: install-csit-dependencies