X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Ftestbed-setup%2Fansible%2Froles%2Ftrex%2Fdefaults%2Fmain.yaml;fp=resources%2Ftools%2Ftestbed-setup%2Fansible%2Froles%2Ftrex%2Fdefaults%2Fmain.yaml;h=0fb7dd37a75b6ac1367c4f154b0e2ed07bf7ebee;hp=c3caf52d769c80a9f0ee6e3de7c8d783c140972b;hb=7b93e96740997dab4383140a639b055e074f63c1;hpb=ecfe59f83a49e0dda9cead06b81339e4ea545053

diff --git a/resources/tools/testbed-setup/ansible/roles/trex/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/trex/defaults/main.yaml
index c3caf52d76..0fb7dd37a7 100644
--- a/resources/tools/testbed-setup/ansible/roles/trex/defaults/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/trex/defaults/main.yaml
@@ -1,23 +1,35 @@
 ---
 # file: roles/trex/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:
   - []
 
 packages_by_distro:
   ubuntu:
-    - "build-essential"
-    - "libmnl-dev"
-    - "libnuma-dev"
-    - "libpcap-dev"
-    - "librdmacm-dev"
-    - "librdmacm1"
-    - "libssl-dev"
-    - "pciutils"
-    - "python3-pip"
-    - "zlib1g-dev"
+    bionic:
+      - "build-essential"
+      - "libmnl-dev"
+      - "libnuma-dev"
+      - "libpcap-dev"
+      - "librdmacm-dev"
+      - "librdmacm1"
+      - "libssl-dev"
+      - "pciutils"
+      - "python3-pip"
+      - "zlib1g-dev"
+    focal:
+      - "build-essential"
+      - "libmnl-dev"
+      - "libnuma-dev"
+      - "libpcap-dev"
+      - "librdmacm-dev"
+      - "librdmacm1"
+      - "libssl-dev"
+      - "pciutils"
+      - "python3-pip"
+      - "zlib1g-dev"
 
 packages_by_arch:
   aarch64:
@@ -28,11 +40,6 @@ packages_by_arch:
 trex_target_dir: "/opt"
 trex_url: "https://github.com/cisco-system-traffic-generator/trex-core/archive/"
 trex_version:
-  # rls1908
-  - "2.54"
-  # rls2001
-  # rls2005
-  - "2.73"
   # rls2009
   - "2.82"
   # rls2101