2 files changed, 17 insertions, 5 deletions
diff --git a/resources/tools/testbed-setup/ansible/roles/ab/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/ab/defaults/main.yaml
index 0609b06855..45b80be42d 100644
--- a/resources/tools/testbed-setup/ansible/roles/ab/defaults/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/ab/defaults/main.yaml
@@ -1,14 +1,17 @@
 ---
 # file: roles/wrk/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:
-    - "apache2-utils"
+    bionic:
+      - "apache2-utils"
+    focal:
+      - "apache2-utils"
 
 packages_by_arch:
   aarch64:
diff --git a/resources/tools/testbed-setup/ansible/roles/ab/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/ab/tasks/main.yaml
index 9153198cfb..37e702e6df 100644
--- a/resources/tools/testbed-setup/ansible/roles/ab/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/ab/tasks/main.yaml
@@ -1,9 +1,18 @@
 ---
 # file: roles/ab/tasks/main.yaml
 
-- name: Install Apache ab tools
+- name: Inst - Update Package Cache (APT)
+  apt:
+    update_cache: yes
+    cache_valid_time: 3600
+  when:
+    - ansible_distribution|lower == 'ubuntu'
+  tags:
+    - ab-inst-prerequisites
+
+- name: Inst - Apache ab tools
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: present
-    update_cache: true
-  tags: install-ab
+  tags:
+    - ab-inst
+\ No newline at end of file