From 3a572844b1048fd14640ae5cce7102adfc77e7ba Mon Sep 17 00:00:00 2001
From: Kevin Coakley <kcoakley@sdsc.edu>
Date: Wed, 19 Oct 2022 10:39:21 -0700
Subject: [PATCH] Change min version to 2.10

Use FQCN names
---
 .github/workflows/molecule-test.yml |  2 +-
 meta/main.yml                       |  4 ++--
 molecule/ansible-lint.yml           |  4 ----
 tasks/main.yml                      | 16 +++++++++-------
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/molecule-test.yml b/.github/workflows/molecule-test.yml
index 6e5868d..27fe296 100644
--- a/.github/workflows/molecule-test.yml
+++ b/.github/workflows/molecule-test.yml
@@ -10,7 +10,7 @@ jobs:
       matrix:
         molecule_distro: ['rockylinux8', 'ubuntu2004', 'ubuntu2204']
     env:
-      ANSIBLE_CALLBACK_WHITELIST: profile_tasks
+      ANSIBLE_CALLBACKS_ENABLED: profile_tasks
 
     steps:
       - uses: actions/checkout@v1
diff --git a/meta/main.yml b/meta/main.yml
index e0679e0..70b2041 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -18,7 +18,7 @@ galaxy_info:
   # - CC-BY
   license: BSD
 
-  min_ansible_version: "2.5"
+  min_ansible_version: "2.10"
 
   #
   # platforms is a list of platforms, and each platform has a name and a list of versions.
@@ -29,8 +29,8 @@ galaxy_info:
         - "8"
     - name: Ubuntu
       versions:
-        - bionic
         - focal
+        - jammy
 
   galaxy_tags:
     - system
diff --git a/molecule/ansible-lint.yml b/molecule/ansible-lint.yml
index e9ae42b..5891ff5 100644
--- a/molecule/ansible-lint.yml
+++ b/molecule/ansible-lint.yml
@@ -1,7 +1,3 @@
 ---
-warn_list:
-  - internal-error
-  - role-name
-  - fqcn-builtins
 skip_list:
   - yaml
diff --git a/tasks/main.yml b/tasks/main.yml
index 6c2e4c1..e1ecbb9 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Download and install rubygems (RedHat)
-  package:
+  ansible.builtin.package:
     name: rubygems
     state: present
   when: ansible_os_family == "RedHat"
@@ -8,14 +8,14 @@
   delay: 5
 
 - name: Run "apt-get update" (Debian)
-  apt:
+  ansible.builtin.apt:
     update_cache: true
   when: ansible_os_family == "Debian"
   retries: 5
   delay: 5
 
 - name: Download and install Ruby (Debian)
-  package:
+  ansible.builtin.package:
     name: ruby
     state: present
   when: ansible_os_family == "Debian"
@@ -23,7 +23,7 @@
   delay: 5
 
 - name: Download and install the facter Gem
-  gem:
+  community.general.gem:
     name: facter
     state: present
     version: "{{ facter_version }}"
@@ -33,7 +33,7 @@
   delay: 5
 
 - name: Create a symbolic link for /usr/bin/facter (RedHat)
-  file:
+  ansible.builtin.file:
     src: /usr/local/bin/facter
     dest: /usr/bin/facter
     owner: root
@@ -41,5 +41,7 @@
     state: link
   when: ansible_os_family == "RedHat"
 
-- name: Rerun setup to gather the new facter facts
-  action: setup
+- name: Rerun setup module to gather facts
+  ansible.builtin.setup:
+    gather_subset:
+      - facter