diff options
| author |   pmikus <pmikus@cisco.com> | 2021-03-22 08:46:04 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2021-03-22 09:03:17 +0000 |
| commit | 3402c93328d877ef09a026f5a491eabd34f8bc1e (patch) | |
| tree | 7948ecd2413383669b9f1703b7c80d7f68f89cf1 /resources/tools/testbed-setup/ansible/roles/ab | |
| parent | 026d128b96a386781733961edbf26ba197530954 (diff) | |
Infra: Ansible sync
Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I4b1516a957447b8356949626e385b9317ed1933c
Diffstat (limited to 'resources/tools/testbed-setup/ansible/roles/ab')
| -rw-r--r-- | resources/tools/testbed-setup/ansible/roles/ab/defaults/main.yaml | 7 | ||||
| -rw-r--r-- | resources/tools/testbed-setup/ansible/roles/ab/tasks/main.yaml | 15 |
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 |