From 7b93e96740997dab4383140a639b055e074f63c1 Mon Sep 17 00:00:00 2001 From: pmikus Date: Mon, 15 Feb 2021 16:16:31 +0000 Subject: Infra: Ansible Ubuntu Focal Signed-off-by: pmikus Change-Id: I6558938fe4bbdfb5add7a361adb4a12da6b0a6dc --- .../ansible/roles/vpp/defaults/main.yaml | 25 +++++++++++++++------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'resources/tools/testbed-setup/ansible/roles/vpp/defaults') diff --git a/resources/tools/testbed-setup/ansible/roles/vpp/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/vpp/defaults/main.yaml index 323d00cf29..7fac499307 100644 --- a/resources/tools/testbed-setup/ansible/roles/vpp/defaults/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/vpp/defaults/main.yaml @@ -1,7 +1,7 @@ --- # file: roles/vpp/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: - "gdb" @@ -12,13 +12,22 @@ packages_base: packages_by_distro: ubuntu: - - "build-essential" - - "libglib2.0-dev" - - "libmbedcrypto1" - - "libmbedtls10" - - "libmbedx509-0" - - "libnuma-dev" - - "libpixman-1-dev" + bionic: + - "build-essential" + - "libglib2.0-dev" + - "libmbedcrypto1" + - "libmbedtls10" + - "libmbedx509-0" + - "libnuma-dev" + - "libpixman-1-dev" + focal: + - "build-essential" + - "libglib2.0-dev" + - "libmbedcrypto3" + - "libmbedtls12" + - "libmbedx509-0" + - "libnuma-dev" + - "libpixman-1-dev" packages_by_arch: aarch64: -- cgit 1.2.3-korg