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/common/defaults/main.yaml | 25 ----------------------
 fdio.infra.ansible/roles/common/handlers/main.yaml |  2 +-
 fdio.infra.ansible/roles/common/tasks/main.yaml    | 14 ++++++------
 3 files changed, 8 insertions(+), 33 deletions(-)

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

diff --git a/fdio.infra.ansible/roles/common/defaults/main.yaml b/fdio.infra.ansible/roles/common/defaults/main.yaml
index 77a9c83740..9ded8fcba9 100644
--- a/fdio.infra.ansible/roles/common/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/common/defaults/main.yaml
@@ -19,35 +19,10 @@ packages_base:
 
 packages_by_distro:
   ubuntu:
-    focal:
-      - "bpfcc-tools"
-      - "build-essential"
-      - "libbpfcc"
-      - "libbpfcc-dev"
-      - "libclang1-9"
-      - "libllvm9"
-      - "libpcap-dev"
-      - "net-tools"
-      - "python3-all"
-      - "python3-apt"
-      - "python3-bpfcc"
-      - "python3-cffi"
-      - "python3-cffi-backend"
-      - "python3-dev"
-      - "python3-pip"
-      - "python3-pyelftools"
-      - "python3-setuptools"
     jammy:
       - "build-essential"
       - "libpcap-dev"
       - "net-tools"
-      - "python-all"
-      - "python-apt"
-      - "python-cffi"
-      - "python-cffi-backend"
-      - "python-dev"
-      - "python-pip"
-      - "python-setuptools"
       - "python3-all"
       - "python3-apt"
       - "python3-cffi"
diff --git a/fdio.infra.ansible/roles/common/handlers/main.yaml b/fdio.infra.ansible/roles/common/handlers/main.yaml
index bb317e8067..0a4944b4ca 100644
--- a/fdio.infra.ansible/roles/common/handlers/main.yaml
+++ b/fdio.infra.ansible/roles/common/handlers/main.yaml
@@ -2,7 +2,7 @@
 # file: roles/common/handlers/main.yaml
 
 - name: Reboot Server
-  reboot:
+  ansible.builtin.reboot:
     reboot_timeout: 3600
   tags:
     - reboot-server
diff --git a/fdio.infra.ansible/roles/common/tasks/main.yaml b/fdio.infra.ansible/roles/common/tasks/main.yaml
index 7418709c99..7f122d23aa 100644
--- a/fdio.infra.ansible/roles/common/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/common/tasks/main.yaml
@@ -2,7 +2,7 @@
 # file: roles/common/tasks/main.yaml
 
 - name: Conf - Add permanent proxy settings
-  lineinfile:
+  ansible.builtin.lineinfile:
     path: "/etc/environment"
     state: "present"
     line: "{{ item.key }}={{ item.value }}"
@@ -12,7 +12,7 @@
     - common-conf-proxy
 
 - name: Inst - Update package cache (apt)
-  apt:
+  ansible.builtin.apt:
     update_cache: true
     cache_valid_time: 3600
   when:
@@ -21,21 +21,21 @@
     - common-inst-prerequisites
 
 - name: Inst - Prerequisites
-  package:
+  ansible.builtin.package:
     name: "{{ packages | flatten(levels=1) }}"
-    state: latest
+    state: "latest"
   tags:
     - common-inst-prerequisites
 
 - name: Inst - Meson (DPDK)
-  pip:
+  ansible.builtin.pip:
     name:
       - "meson==0.49.2"
   tags:
     - common-inst-meson
 
 - name: Conf - sudoers admin
-  lineinfile:
+  ansible.builtin.lineinfile:
     path: "/etc/sudoers"
     state: "present"
     regexp: "^%admin ALL="
@@ -45,7 +45,7 @@
     - common-conf-sudoers
 
 - name: Conf - sudoers nopasswd
-  lineinfile:
+  ansible.builtin.lineinfile:
     path: "/etc/sudoers"
     state: "present"
     regexp: "^%sudo"
-- 
cgit 1.2.3-korg