X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Ftestbed-setup%2Fansible%2Froles%2Fcommon%2Fdefaults%2Fmain.yaml;h=7c2931ebec1274e5a6b6ccdd30756cdc2cf2ed1e;hb=eb30e6b70823a30f35a1841ff996e2ead2cf0d08;hp=15a241d1ca0e20098a6131b19e7648baaff535c4;hpb=8605f3f406468f57bb9b2eac12a4421f65965300;p=csit.git

diff --git a/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml
index 15a241d1ca..7c2931ebec 100644
--- a/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml
@@ -1,7 +1,7 @@
 ---
 # file: roles/common/defaults/main.yaml
 
-packages: "{{ packages_base + packages_by_distro[ansible_distribution | lower] + packages_by_arch[ansible_machine] }}"
+packages: "{{ packages_base + packages_by_distro[ansible_distribution|lower][ansible_distribution_release] + packages_by_arch[ansible_machine] }}"
 
 packages_base:
   - "autoconf"
@@ -9,6 +9,7 @@ packages_base:
   - "dkms"
   - "iperf3"
   - "linux-tools-common"
+  - "ninja-build"
   - "qemu-system"
   - "socat"
   - "unzip"
@@ -16,28 +17,43 @@ packages_base:
 
 packages_by_distro:
   ubuntu:
-    - "build-essential"
-    - "libpcap-dev"
-    - "python-all"
-    - "python-apt"
-    - "python-cffi"
-    - "python-cffi-backend"
-    - "python-dev"
-    - "python-pip"
-    - "python-setuptools"
-    - "python3-all"
-    - "python3-apt"
-    - "python3-cffi"
-    - "python3-cffi-backend"
-    - "python3-dev"
-    - "python3-pip"
-    - "python3-setuptools"
+    bionic:
+      - "build-essential"
+      - "libpcap-dev"
+      - "net-tools"
+      - "python-all"
+      - "python-apt"
+      - "python-cffi"
+      - "python-cffi-backend"
+      - "python-dev"
+      - "python-pip"
+      - "python-setuptools"
+      - "python3-all"
+      - "python3-apt"
+      - "python3-cffi"
+      - "python3-cffi-backend"
+      - "python3-dev"
+      - "python3-pip"
+      - "python3-setuptools"
+    focal:
+      - "build-essential"
+      - "libpcap-dev"
+      - "net-tools"
+      - "python3-all"
+      - "python3-apt"
+      - "python3-cffi"
+      - "python3-cffi-backend"
+      - "python3-dev"
+      - "python3-pip"
+      - "python3-setuptools"
 
 packages_by_arch:
   aarch64:
     - "gfortran"
     - "libblas-dev"
+    - "libffi-dev"
     - "liblapack-dev"
+    - "libssl-dev"
   x86_64:
     - []