7 files changed, 50 insertions, 56 deletions
diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
index 17be80064a..ba9c46634f 100644
--- a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
@@ -1,9 +1,8 @@
 ---
 # file: roles/calibration/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: Run Spectre Meltdown checker
   raw: 'spectre-meltdown-checker --no-color'
diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu.yaml b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu_bionic.yaml
index bb4ad1e8c7..ef453cdf9a 100644
--- a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu_bionic.yaml
@@ -1,5 +1,5 @@
 ---
-# file: roles/calibration/tasks/ubuntu.yaml
+# file: roles/calibration/tasks/ubuntu_bionic.yaml
 
 - name: Install calibration dependencies
   apt:
diff --git a/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_bionic.yaml b/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_bionic.yaml
index d80eb5edac..31872e035f 100644
--- a/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_bionic.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_bionic.yaml
@@ -9,16 +9,16 @@
 
 - name: Install CSIT dependencies
   apt:
-    name: '{{ item }}'
+    name:
+      - 'python-apt'
+      - 'python-setuptools'
+      - 'git'
+      - 'crudini'
+      - 'expect'
+      - 'socat'
+      - 'qemu-system'
+      - 'build-essential'
     state: 'present'
     cache_valid_time: 3600
     install_recommends: False
-  with_items:
-    - 'python-apt'
-    - 'python-setuptools'
-    - 'git'
-    - 'crudini'
-    - 'expect'
-    - 'socat'
-    - 'qemu-system'
   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
index 7ed9daed22..8f0be4331c 100644
--- a/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_bionic.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_bionic.yaml
@@ -3,24 +3,23 @@
 
 - name: Install CSIT dependencies
   apt:
-    name: '{{ item }}'
+    name:
+      - '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'
     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
diff --git a/resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu_bionic.yaml b/resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu_bionic.yaml
index f60aaeec64..27b8b7248e 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu_bionic.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu_bionic.yaml
@@ -3,9 +3,8 @@
 
 - name: Install CSIT dependencies
   apt:
-    name: '{{ item }}'
+    name:
+      - 'unzip'
     state: 'present'
     install_recommends: False
-  with_items:
-    - 'unzip'
   tags: install-csit-dependencies
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 1ad96b26fc..d9026e9182 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
@@ -55,8 +55,7 @@
 
 - name: Install CSIT PIP requirements
   pip:
-    name: '{{ item }}'
-  with_items:
+    name:
       - 'docopt==0.6.2'
       - 'ecdsa==0.13'
       - 'enum34==1.1.2'
@@ -80,7 +79,8 @@
 
 - name: Install VPP PIP requirements
   pip:
-    name: 'aenum'
+    name:
+      - 'aenum==2.1.2'
   tags: install-pip
 
 - name: Load vfio-pci by default
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 194609722e..fd08215aa5 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
@@ -3,22 +3,20 @@
 
 - name: Install CSIT dependencies
   apt:
-    name: '{{ item }}'
+    name:
+      - 'python-dev'
+      - 'python-virtualenv'
+      - 'python-pip'
+      - 'libpcap-dev'
+      - 'cpufrequtils'
+      - 'cgroup-bin'
+      - 'zlib1g-dev'
+      - 'apt-transport-https'
+      - 'ca-certificates'
+      - 'software-properties-common'
+      - 'libnuma-dev'
     state: 'present'
     install_recommends: False
-  with_items:
-    - 'python-dev'
-    - 'python-virtualenv'
-    - 'python-pip'
-    - 'libpcap-dev'
-    - 'cpufrequtils'
-    - 'cgroup-bin'
-    - 'zlib1g-dev'
-    - 'apt-transport-https'
-    - 'ca-certificates'
-    - 'software-properties-common'
-    - 'cron'
-    - 'libnuma-dev'
   tags: install-csit-dependencies
 
 - name: Add an Apt signing key, for docker-ce repository
@@ -99,13 +97,12 @@
 
 - name: Install Kubernetes
   apt:
-    name: '{{ item }}={{ kubernetes_apt_package_name }}'
+    name:
+      - 'kubeadm={{ kubernetes_apt_package_name }}'
+      - 'kubectl={{ kubernetes_apt_package_name }}'
+      - 'kubelet={{ kubernetes_apt_package_name }}'
     state: 'present'
     force: yes
-  with_items:
-    - 'kubeadm'
-    - 'kubectl'
-    - 'kubelet'
   tags: install-kubernetes
 
 - name: Apply kubelet parameter