From 7b93e96740997dab4383140a639b055e074f63c1 Mon Sep 17 00:00:00 2001
From: pmikus <pmikus@cisco.com>
Date: Mon, 15 Feb 2021 16:16:31 +0000
Subject: Infra: Ansible Ubuntu Focal

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I6558938fe4bbdfb5add7a361adb4a12da6b0a6dc
---
 .../testbed-setup/ansible/roles/dpdk/defaults/main.yaml    | 14 +++++++-------
 .../tools/testbed-setup/ansible/roles/dpdk/tasks/main.yaml | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'resources/tools/testbed-setup/ansible/roles/dpdk')

diff --git a/resources/tools/testbed-setup/ansible/roles/dpdk/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/dpdk/defaults/main.yaml
index e43c28403b..2a8c691728 100644
--- a/resources/tools/testbed-setup/ansible/roles/dpdk/defaults/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/dpdk/defaults/main.yaml
@@ -1,15 +1,19 @@
 ---
 # file: roles/dpdk/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"
-    - "libnuma-dev"
+    bionic:
+      - "build-essential"
+      - "libnuma-dev"
+    focal:
+      - "build-essential"
+      - "libnuma-dev"
 
 packages_by_arch:
   aarch64:
@@ -19,13 +23,9 @@ packages_by_arch:
 
 dpdk_target_dir: "/opt"
 dpdk_version:
-  - "19.02"
   - "20.02"
 dpdk_url: "https://fast.dpdk.org/rel"
 dpdk_build_targets:
-  "19.02":
-    aarch64: "arm64-armv8a-linuxapp-gcc"
-    x86_64: "x86_64-native-linuxapp-gcc"
   "20.02":
     aarch64: "arm64-armv8a-linux-gcc"
     x86_64: "x86_64-native-linux-gcc"
diff --git a/resources/tools/testbed-setup/ansible/roles/dpdk/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/dpdk/tasks/main.yaml
index 27a5c2c9e3..46f942be93 100644
--- a/resources/tools/testbed-setup/ansible/roles/dpdk/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/dpdk/tasks/main.yaml
@@ -25,7 +25,7 @@
   loop: "{{ dpdk_version }}"
   register: "dpdk_downloaded"
   tags:
-    - install-dpdk
+    - dpdk-inst
 
 - name: Extract Release Archive
   unarchive:
@@ -37,7 +37,7 @@
   when: "dpdk_downloaded"
   register: "dpdk_extracted"
   tags:
-    - install-dpdk
+    - dpdk-inst
 
 - name: Build igb_uio by default
   lineinfile:
@@ -48,7 +48,7 @@
   when: "dpdk_extracted"
   register: "dpdk_configured"
   tags:
-    - install-dpdk
+    - dpdk-inst
 
 - name: Compile Release I
   become: yes
@@ -57,7 +57,7 @@
   when: "dpdk_configured"
   register: "dpdk_compiled"
   tags:
-    - install-dpdk
+    - dpdk-inst
 
 - name: Link igb_uio Module
   shell: "ln -fs {{ dpdk_target_dir }}/dpdk-{{ item }}/{{ dpdk_build_targets[item][ansible_machine] }}/kmod/igb_uio.ko /lib/modules/`uname -r`/igb_uio.ko && depmod -a"
@@ -65,4 +65,4 @@
   loop: "{{ dpdk_version }}"
   when: "dpdk_compiled"
   tags:
-    - install-dpdk
+    - dpdk-inst
\ No newline at end of file
-- 
cgit 1.2.3-korg