Merge pull request #133 from cisagov/improvement/use-amazon-linux-2022

Drop Amazon Linux 2 in favor of Amazon Linux 2023

Author: jmorrowomni

meta/main.yml

@@ -15,7 +15,7 @@ galaxy_info:
   min_ansible_version: "2.10"
   namespace: cisagov
   platforms:
-    - name: Amazon Linux 2
+    - name: Amazon Linux 2023
       versions:
         - any
     - name: Debian

molecule/default/molecule-no-systemd.yml

@@ -16,8 +16,8 @@ lint: |
   ansible-lint
   flake8
 platforms:
-  - image: amazonlinux:2
-    name: amazonlinux2
+  - image: amazonlinux:2023
+    name: amazonlinux2023
     platform: amd64
   - image: debian:buster-slim
     name: debian10

molecule/default/molecule-with-systemd.yml

@@ -17,8 +17,8 @@ lint: |
 platforms:
   - cgroupns_mode: host
     command: /lib/systemd/systemd
-    image: geerlingguy/docker-amazonlinux2-ansible:latest
-    name: amazonlinux2-systemd
+    image: geerlingguy/docker-amazonlinux2023-ansible:latest
+    name: amazonlinux2023-systemd
     platform: amd64
     pre_build_image: yes
     privileged: yes

requirements-test.txt

@@ -4,7 +4,10 @@
 # OS family.  This simplifies a lot of things for roles that support
 # Kali Linux, so it makes sense to force the installation of Ansible
 # 2.10 or newer.
-ansible>=2.10,<6
+#
+# We need at least version 6 to correctly identify Amazon Linux 2023
+# as using the dnf package manager.
+ansible>=6,<7
 ansible-lint>=5,<6
 flake8
 molecule