Merge pull request #46 from christiangda/feat-improvements

feat: support for new OS

.yamllint

@@ -14,3 +14,4 @@ ignore: |
   .travis.yml
   .ansible-lint
   .yamllint
+  .github

README.md

@@ -44,6 +44,7 @@ This role work on RedHat, CentOS, Amazon Linux, Debian and Ubuntu distributions
   * stream8
 * Rocky Linux
   * 8
+  * 9
 * Amazon Linux
   * 2
 * Ubuntu
@@ -52,6 +53,7 @@ This role work on RedHat, CentOS, Amazon Linux, Debian and Ubuntu distributions
   * 18.*
   * 20.*
   * 21.*
+  * 22.*
 * Debian
   * Stretch (9)
   * buster (10)

meta/main.yml

@@ -30,6 +30,7 @@ galaxy_info:
         - bionic
         - focal
         - impish
+        - jammy
 
   galaxy_tags:
     - aws

molecule/centos-7/INSTALL.rst

@@ -1,11 +1,11 @@
 *******
-Docker driver installation guide
+podman driver installation guide
 *******
 
 Requirements
 ============
 
-* Docker Engine
+* podman Engine
 
 Install
 =======
@@ -19,4 +19,4 @@ widely recommended `'--user' flag`_ when invoking ``pip``.
 
 .. code-block:: bash
 
-    $ python3 -m pip install 'molecule[docker]'
+    $ python3 -m pip install 'molecule[podman]'

molecule/centos-7/molecule.yml

@@ -3,7 +3,7 @@ dependency:
   name: galaxy
 
 driver:
-  name: docker
+  name: podman
 
 provisioner:
   name: ansible

molecule/centos-8/INSTALL.rst

@@ -1,11 +1,11 @@
 *******
-Docker driver installation guide
+podman driver installation guide
 *******
 
 Requirements
 ============
 
-* Docker Engine
+* podman Engine
 
 Install
 =======
@@ -19,4 +19,4 @@ widely recommended `'--user' flag`_ when invoking ``pip``.
 
 .. code-block:: bash
 
-    $ python3 -m pip install 'molecule[docker]'
+    $ python3 -m pip install 'molecule[podman]'

molecule/centos-8/molecule.yml

@@ -3,7 +3,7 @@ dependency:
   name: galaxy
 
 driver:
-  name: docker
+  name: podman
 
 provisioner:
   name: ansible

molecule/default/INSTALL.rst

@@ -1,11 +1,11 @@
 *******
-Docker driver installation guide
+podman driver installation guide
 *******
 
 Requirements
 ============
 
-* Docker Engine
+* podman Engine
 
 Install
 =======
@@ -19,4 +19,4 @@ widely recommended `'--user' flag`_ when invoking ``pip``.
 
 .. code-block:: bash
 
-    $ python3 -m pip install 'molecule[docker]'
+    $ python3 -m pip install 'molecule[podman]'

molecule/default/molecule.yml

@@ -3,7 +3,7 @@ dependency:
   name: galaxy
 
 driver:
-  name: docker
+  name: podman
 
 provisioner:
   name: ansible

molecule/docker/INSTALL.rst

@@ -1,11 +1,11 @@
 *******
-Docker driver installation guide
+podman driver installation guide
 *******
 
 Requirements
 ============
 
-* Docker Engine
+* podman Engine
 
 Install
 =======
@@ -19,4 +19,4 @@ widely recommended `'--user' flag`_ when invoking ``pip``.
 
 .. code-block:: bash
 
-    $ python3 -m pip install 'molecule[docker]'
+    $ python3 -m pip install 'molecule[podman]'

molecule/docker/verify.yml

@@ -0,0 +1,10 @@
+---
+# This is an example playbook to execute Ansible tests.
+
+- name: Verify
+  hosts: all
+  gather_facts: false
+  tasks:
+  - name: Example assertion
+    ansible.builtin.assert:
+      that: true

molecule/podman/INSTALL.rst

@@ -1,11 +1,11 @@
 *******
-Docker driver installation guide
+podman driver installation guide
 *******
 
 Requirements
 ============
 
-* Docker Engine
+* podman Engine
 
 Install
 =======

molecule/redhat-8/INSTALL.rst

@@ -1,11 +1,11 @@
 *******
-Docker driver installation guide
+podman driver installation guide
 *******
 
 Requirements
 ============
 
-* Docker Engine
+* podman Engine
 
 Install
 =======

molecule/redhat-8/converge.yml

@@ -2,19 +2,6 @@
 - name: Converge
   hosts: all
 
-  pre_tasks:
-    - name: Update apt cache
-      apt: update_cache=true cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-      changed_when: false
-
-    - name: Install gnupg
-      apt:
-        name: gnupg
-        state: latest
-      when: ansible_os_family == 'Debian'
-      changed_when: false
-
   tasks:
     - name: "Include christiangda.epel_repo"
       include_role:

molecule/rocky-8/INSTALL.rst

@@ -0,0 +1,22 @@
+*******
+podman driver installation guide
+*******
+
+Requirements
+============
+
+* podman Engine
+
+Install
+=======
+
+Please refer to the `Virtual environment`_ documentation for installation best
+practices. If not using a virtual environment, please consider passing the
+widely recommended `'--user' flag`_ when invoking ``pip``.
+
+.. _Virtual environment: https://virtualenv.pypa.io/en/latest/
+.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site
+
+.. code-block:: bash
+
+    $ python3 -m pip install 'molecule[podman]'

molecule/rocky-8/converge.yml

@@ -0,0 +1,37 @@
+---
+- name: Converge
+  hosts: all
+
+  tasks:
+    - name: "Include christiangda.epel_repo"
+      include_role:
+        name: christiangda.epel_repo
+
+    - name: "Include christiangda.awscli_configure"
+      include_role:
+        name: christiangda.awscli_configure
+
+  roles:
+    - role: christiangda.epel_repo
+      when: >
+        ansible_os_family == 'RedHat' and (
+          ansible_distribution == 'CentOS' or
+          ansible_distribution == 'RedHat' or
+          ansible_distribution == 'Amazon'
+        )
+    - role: christiangda.awscli_configure
+      vars:
+        awscliconf_path: "/root"
+        awscliconf_files:
+          credentials:
+            - AmazonCloudWatchAgent:
+                aws_access_key_id: "AKIAIOSFODNN7EXAMPLE"
+                aws_secret_access_key: "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
+          config:
+            - profile AmazonCloudWatchAgent:
+                region: eu-west-1
+    - role: christiangda.amazon_cloudwatch_agent
+      vars:
+        cwa_agent_mode: "onPremise"
+        cwa_profile: "AmazonCloudWatchAgent"
+        cwa_aws_region: "eu-west-1"

molecule/rocky-8/molecule.yml

@@ -0,0 +1,26 @@
+---
+dependency:
+  name: galaxy
+
+driver:
+  name: podman
+
+provisioner:
+  name: ansible
+  # log: true
+
+verifier:
+  name: ansible
+
+scenario:
+  name: rocky-8
+
+platforms:
+  - name: rocky-8
+    image: rockylinux:8
+    pre_build_image: true
+
+# lint: |
+#   set -e
+#   yamllint .
+#   ansible-lint .

molecule/rocky-8/requirements.yml

@@ -0,0 +1,3 @@
+---
+- src: christiangda.epel_repo
+- src: christiangda.awscli_configure

molecule/rocky-8/verify.yml

@@ -0,0 +1,10 @@
+---
+# This is an example playbook to execute Ansible tests.
+
+- name: Verify
+  hosts: all
+  gather_facts: false
+  tasks:
+  - name: Example assertion
+    ansible.builtin.assert:
+      that: true