From 0b947247146f27936e986c262fc9f1d641b5ac4f Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Wed, 17 Aug 2022 13:57:23 +0000
Subject: feat(ansible): Ubuntu Jammy VI.

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: I7dda690f2dc2e42bf6c67d3faa3327a03de3a9fa
---
 fdio.infra.ansible/roles/vpp/defaults/main.yaml | 14 +++-----------
 fdio.infra.ansible/roles/vpp/tasks/main.yaml    |  6 +++---
 2 files changed, 6 insertions(+), 14 deletions(-)

(limited to 'fdio.infra.ansible/roles/vpp')

diff --git a/fdio.infra.ansible/roles/vpp/defaults/main.yaml b/fdio.infra.ansible/roles/vpp/defaults/main.yaml
index 55051b8c8f..00c56859d0 100644
--- a/fdio.infra.ansible/roles/vpp/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/vpp/defaults/main.yaml
@@ -12,20 +12,12 @@ packages_base:
 
 packages_by_distro:
   ubuntu:
-    focal:
-      - "build-essential"
-      - "libglib2.0-dev"
-      - "libmbedcrypto3"
-      - "libmbedtls12"
-      - "libmbedx509-0"
-      - "libnuma-dev"
-      - "libpixman-1-dev"
     jammy:
       - "build-essential"
       - "libglib2.0-dev"
-      - "libmbedcrypto1"
-      - "libmbedtls10"
-      - "libmbedx509-0"
+      - "libmbedcrypto7"
+      - "libmbedtls14"
+      - "libmbedx509-1"
       - "libnuma-dev"
       - "libpixman-1-dev"
 
diff --git a/fdio.infra.ansible/roles/vpp/tasks/main.yaml b/fdio.infra.ansible/roles/vpp/tasks/main.yaml
index 320584c432..cea06b764d 100644
--- a/fdio.infra.ansible/roles/vpp/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/vpp/tasks/main.yaml
@@ -2,7 +2,7 @@
 # file: roles/vpp/tasks/main.yaml
 
 - name: Inst - Update Package Cache (APT)
-  apt:
+  ansible.builtin.apt:
     update_cache: true
     cache_valid_time: 3600
   when:
@@ -11,14 +11,14 @@
     - vpp-inst-prerequisites
 
 - name: Inst - Prerequisites
-  package:
+  ansible.builtin.package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest
   tags:
     - vpp-inst-prerequisites
 
 - name: Conf - sysctl
-  file:
+  ansible.builtin.file:
     src: "/dev/null"
     dest: "/etc/sysctl.d/80-vpp.conf"
     state: "link"
-- 
cgit 1.2.3-korg