diff options
| author |   pmikus <peter.mikus@protonmail.ch> | 2023-07-14 12:56:06 +0000 |
|---|---|---|
| committer | pmikus <peter.mikus@protonmail.ch> | 2023-07-14 12:56:06 +0000 |
| commit | f04617b817436dd45eca973c24455fb9c147b3f2 (patch) | |
| tree | 6f849848077646899db1682a33944846410c259a /fdio.infra.ansible/roles | |
| parent | 6cfd831b241b9711c8573364c9e59d0e9ec2cdad (diff) | |
fix(packer): Naming
Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: I8127beeb6664aa51ef5cb313d658ab2e5638b581
Diffstat (limited to 'fdio.infra.ansible/roles')
4 files changed, 14 insertions, 6 deletions
diff --git a/fdio.infra.ansible/roles/aws/defaults/main.yaml b/fdio.infra.ansible/roles/aws/defaults/main.yaml index e9701cd5ab..5b6978da51 100644 --- a/fdio.infra.ansible/roles/aws/defaults/main.yaml +++ b/fdio.infra.ansible/roles/aws/defaults/main.yaml @@ -1,8 +1,15 @@ --- -# file: roles/aws/defaults/main.yaml +# file: defaults/main.yaml packages: "{{ packages_base + packages_by_distro[ansible_distribution|lower] + packages_by_arch[ansible_machine] }}" +packages_repo: + ubuntu: + aarch64: + "http://ports.ubuntu.com/" + x86_64: + "http://archive.ubuntu.com/ubuntu" + packages_base: - [] diff --git a/fdio.infra.ansible/roles/aws/tasks/ubuntu_jammy.yaml b/fdio.infra.ansible/roles/aws/tasks/ubuntu_jammy.yaml index 24da26d297..c589239f61 100644 --- a/fdio.infra.ansible/roles/aws/tasks/ubuntu_jammy.yaml +++ b/fdio.infra.ansible/roles/aws/tasks/ubuntu_jammy.yaml @@ -3,7 +3,7 @@ - name: Enable deb-src APT Repository ansible.builtin.apt_repository: - repo: "deb-src http://archive.ubuntu.com/ubuntu jammy main" + repo: "deb-src {{ packages_repo[ansible_distribution|lower][ansible_machine] }} jammy main" state: "present" update_cache: true tags: @@ -11,7 +11,7 @@ - name: Enable deb APT Repository Focal ansible.builtin.apt_repository: - repo: "deb http://archive.ubuntu.com/ubuntu focal main" + repo: "deb {{ packages_repo[ansible_distribution|lower][ansible_machine] }} focal main" state: "present" update_cache: true tags: @@ -19,7 +19,7 @@ - name: Enable deb-src APT Repository Focal Src ansible.builtin.apt_repository: - repo: "deb-src http://archive.ubuntu.com/ubuntu focal main" + repo: "deb-src {{ packages_repo[ansible_distribution|lower][ansible_machine] }} focal main" state: "present" update_cache: true tags: diff --git a/fdio.infra.ansible/roles/iperf/defaults/main.yaml b/fdio.infra.ansible/roles/iperf/defaults/main.yaml index 72a3604d1d..f757b287b7 100644 --- a/fdio.infra.ansible/roles/iperf/defaults/main.yaml +++ b/fdio.infra.ansible/roles/iperf/defaults/main.yaml @@ -10,7 +10,7 @@ packages_by_distro: ubuntu: jammy: - "build-essential" - - "lib32z1" + #- "lib32z1" packages_by_arch: aarch64: diff --git a/fdio.infra.ansible/roles/trex/defaults/main.yaml b/fdio.infra.ansible/roles/trex/defaults/main.yaml index 18a2b56bda..ad7a5762f7 100644 --- a/fdio.infra.ansible/roles/trex/defaults/main.yaml +++ b/fdio.infra.ansible/roles/trex/defaults/main.yaml @@ -23,7 +23,8 @@ packages_by_distro: packages_by_arch: aarch64: - - [] + - "libibverbs-dev" + - "libibverbs1" x86_64: - [] |