diff options
| author |   pmikus <pmikus@cisco.com> | 2021-02-15 16:16:31 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2021-02-19 11:57:30 +0000 |
| commit | 7b93e96740997dab4383140a639b055e074f63c1 (patch) | |
| tree | 8d54d10e65af9a6c58546fd3b36aed9cb8d174af /resources/tools/testbed-setup/ansible/roles/iperf | |
| parent | ecfe59f83a49e0dda9cead06b81339e4ea545053 (diff) | |
Infra: Ansible Ubuntu Focal
Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I6558938fe4bbdfb5add7a361adb4a12da6b0a6dc
Diffstat (limited to 'resources/tools/testbed-setup/ansible/roles/iperf')
| -rw-r--r-- | resources/tools/testbed-setup/ansible/roles/iperf/defaults/main.yaml | 10 | ||||
| -rw-r--r-- | resources/tools/testbed-setup/ansible/roles/iperf/tasks/main.yaml | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/resources/tools/testbed-setup/ansible/roles/iperf/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/iperf/defaults/main.yaml index 50210660f4..07af60b63a 100644 --- a/resources/tools/testbed-setup/ansible/roles/iperf/defaults/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/iperf/defaults/main.yaml @@ -1,15 +1,19 @@ --- # file: roles/iperf/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" - - "lib32z1" + bionic: + - "build-essential" + - "lib32z1" + focal: + - "build-essential" + - "lib32z1" packages_by_arch: aarch64: diff --git a/resources/tools/testbed-setup/ansible/roles/iperf/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/iperf/tasks/main.yaml index 853a00cb86..f8948cae57 100644 --- a/resources/tools/testbed-setup/ansible/roles/iperf/tasks/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/iperf/tasks/main.yaml @@ -25,7 +25,7 @@ mode: 0644 loop: "{{ iperf_version }}" tags: - - install-iperf + - iperf-inst - name: Extract Release Archive unarchive: @@ -35,7 +35,7 @@ creates: "{{ iperf_target_dir }}/iperf-{{ item }}/src" loop: "{{ iperf_version }}" tags: - - install-iperf + - iperf-inst - name: Compile Release I command: "./configure" @@ -43,7 +43,7 @@ chdir: "{{ iperf_target_dir }}/iperf-{{ item }}/" loop: "{{ iperf_version }}" tags: - - install-iperf + - iperf-inst - name: Compile Release II command: "make" @@ -51,7 +51,7 @@ chdir: "{{ iperf_target_dir }}/iperf-{{ item }}/" loop: "{{ iperf_version }}" tags: - - install-iperf + - iperf-inst - name: Compile Release III command: "make install" @@ -59,4 +59,4 @@ chdir: "{{ iperf_target_dir }}/iperf-{{ item }}/" loop: "{{ iperf_version }}" tags: - - install-iperf + - iperf-inst
\ No newline at end of file |