Replace Ansible community distribution with Ansible base (#57)

Author: alessfg

.github/dependabot.yml

@@ -6,6 +6,6 @@ updates:
     schedule:
       interval: "daily"
   - package-ecosystem: "pip"
-    directory: "/.github/workflows"
+    directory: "/.github/workflows/requirements"
     schedule:
       interval: "daily"

.github/workflows/galaxy.yml

@@ -18,7 +18,7 @@ jobs:
           python-version: 3.x
 
       - name: Install Ansible
-        run: pip3 install -r .github/workflows/requirements_galaxy.txt
+        run: pip3 install -r .github/workflows/requirements/requirements_galaxy.txt
 
       - name: Import release to Ansible Galaxy
         run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)

.github/workflows/molecule.yml

@@ -33,7 +33,15 @@ jobs:
 
       - name: Install Molecule dependencies
         if: github.event.pull_request.head.repo.full_name == github.repository
-        run: pip3 install -r .github/workflows/requirements_molecule.txt
+        run: pip3 install -r .github/workflows/requirements/requirements_molecule.txt
+
+      - name: Install Ansible base dependencies
+        if: github.event.pull_request.head.repo.full_name == github.repository
+        run: ansible-galaxy install -r .github/workflows/requirements/requirements_ansible.yml
+
+      - name: Uninstall Ansible community distribution (temporary)
+        if: github.event.pull_request.head.repo.full_name == github.repository
+        run: pip3 uninstall -y ansible
 
       - name: Run Molecule tests
         if: github.event.pull_request.head.repo.full_name == github.repository

.github/workflows/requirements/requirements_ansible.yml

@@ -0,0 +1,8 @@
+---
+collections:
+  - name: community.general
+    version: 2.0.1
+  - name: ansible.posix
+    version: 1.1.1
+  - name: community.docker
+    version: 1.2.0

.github/workflows/requirements_galaxy.txt renamed to .github/workflows/requirements/requirements_galaxy.txt

@@ -1,5 +1,4 @@
 ansible-base==2.10.5
-ansible==2.10.6
 ansible-lint==4.3.7
 yamllint==1.26.0
 molecule[docker]==3.2.3

.github/workflows/requirements_molecule.txt renamed to .github/workflows/requirements/requirements_molecule.txt

@@ -1,38 +1,41 @@
-# OSX leaves these everywhere on SMB shares
-._*
-
-# OSX trash
-.DS_Store
+# Any private crt and keys #
+############################
+*.crt
+*.key
+*.pem
+*~
+\#*
 
-# Eclipse files
+# Editor specific #
+###################
+.idea
+.vscode
 .classpath
 .project
 .settings/**
-
-# Emacs save files
+## Emac
 *~
 \#*\#
 .\#*
-
-# Vim-related files
+## Vim
 [._]*.s[a-w][a-z]
 [._]s[a-w][a-z]
 *.un~
 Session.vim
 .netrwhist
 
-# NGINX Plus license files
-*.crt
-*.key
-
-# Visual Studio Code settings
-.vscode
-
-# Default certificate and key
-default.pem
+# OS Specific #
+###############
+Thumbs.db
+.DS_Store
+._*
+scratch/
 
-# IntelliJ IDEA
-.idea
+# Ansible specific #
+####################
+.cache
+*.retry
 
-# Scratch Directory
-scratch/
+# Python specific #
+###################
+__pycache__

.gitignore

@@ -4,11 +4,14 @@
 
 FEATURES:
 
-Add support for Dependabot.
+*   Replace Ansible community distribution with Ansible base and add the necessary extra collections as a dependency requirement. For reference, these are:
+    *   `community.general`
+    *   `ansible.posix`
+*   Add support for Dependabot.
 
 ENHANCEMENTS:
 
-*   Update Ansible base to `2.10.5`, Ansible to `2.10.6`, Molecule to `3.2.3` and yamllint to `1.26.0`.
+*   Update Ansible base to `2.10.5`, Molecule to `3.2.3` and yamllint to `1.26.0`.
 *   Specify GitHub actions Ubuntu release.
 *   Minor GitHub template tweaks, including the creation of a SECURITY doc.
 *   Only run GitHub actions Galaxy CI/CD workflow when a new release is published.

CHANGELOG.md

@@ -14,8 +14,17 @@ This role installs and configures NGINX App Protect (WAF) for NGINX Plus on your
 
 ### Ansible
 
-*   This role is developed and tested with [maintained](https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html#release-status) versions of Ansible. Backwards compatibility is not guaranteed.
-*   Instructions on how to install Ansible can be found in the [Ansible website](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html).
+*   This role is developed and tested with [maintained](https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html) versions of Ansible base. When using Ansible base, you will also need to install the following collections:
+    ```yaml
+    ---
+    collections:
+      - name: community.general
+        version: 2.0.0
+      - name: ansible.posix
+        version: 1.1.1
+    ```
+    **Note:** You can alternatively install the Ansible community distribution if you don't want to manage individual collections.
+*   Instructions on how to install Ansible can be found in the [Ansible website](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html#upgrading-ansible-from-version-2-9-and-older-to-version-2-10-or-later).
 
 ### Molecule
 

README.md

@@ -7,7 +7,7 @@ galaxy_info:
 
   license: Apache License, Version 2.0
 
-  min_ansible_version: 2.9
+  min_ansible_version: 2.10
 
   platforms:
     - name: EL