From bf3ce71ec5074eb30a866ea8b6e01aad03d58e64 Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Thu, 14 Mar 2019 08:02:56 +0000
Subject: Add PAPI dependencies

+ Various small structure optmizations

Change-Id: I1aac9353f72436de53797fc734bef498905c8189
Signed-off-by: Peter Mikus <pmikus@cisco.com>
---
 .../ansible/roles/sut/tasks/main.yaml              |  5 ++---
 .../ansible/roles/sut/tasks/ubuntu.yaml            | 23 -------------------
 .../ansible/roles/sut/tasks/ubuntu_bionic.yaml     | 26 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 26 deletions(-)
 delete mode 100644 resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu.yaml
 create mode 100644 resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_bionic.yaml

(limited to 'resources/tools/testbed-setup/ansible/roles/sut')

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.yaml
deleted file mode 100644
index 69ca52916e..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# file: roles/sut/tasks/ubuntu.yaml
-
-- name: Install CSIT dependencies
-  apt:
-    name: '{{ item }}'
-    state: 'present'
-    install_recommends: False
-  with_items:
-    - 'dkms'
-    - 'pkg-config'
-    - 'libglib2.0-dev'
-    - 'autoconf'
-    - 'libtool'
-    - 'screen'
-    - 'libmbedcrypto1'
-    - 'libmbedtls10'
-    - 'libmbedx509-0'
-    - 'lxc'
-    - 'openjdk-8-jdk'
-    - 'libpixman-1-dev'
-    - 'python-cffi'
-  tags: install-csit-dependencies
diff --git a/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_bionic.yaml b/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_bionic.yaml
new file mode 100644
index 0000000000..7ed9daed22
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_bionic.yaml
@@ -0,0 +1,26 @@
+---
+# file: roles/sut/tasks/ubuntu_bionic.yaml
+
+- name: Install CSIT dependencies
+  apt:
+    name: '{{ item }}'
+    state: 'present'
+    install_recommends: False
+  with_items:
+    - 'dkms'
+    - 'pkg-config'
+    - 'libglib2.0-dev'
+    - 'autoconf'
+    - 'libtool'
+    - 'screen'
+    - 'libmbedcrypto1'
+    - 'libmbedtls10'
+    - 'libmbedx509-0'
+    - 'lxc'
+    - 'openjdk-8-jdk'
+    - 'libpixman-1-dev'
+    - 'python-cffi'
+    - 'python-cffi-backend'
+    - 'python3-cffi'
+    - 'python3-cffi-backend'
+  tags: install-csit-dependencies
-- 
cgit 1.2.3-korg