fix: linting, syntax, workflow and os-support (#4)

* add .ansible-lint

* add supported os

* fix molecule

* reordering key names

* mv `daemon_reload` from tasks to handlers

* fix molecule workflow

* add amazon linux support

* fix amazonlinux version

Author: antmelekhin

.ansible-lint

@@ -0,0 +1,2 @@
+skip_list:
+  - 'fqcn'

.github/workflows/molecule.yml

@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - main
-      - master
 
 jobs:
   test:
@@ -14,16 +13,13 @@ jobs:
     strategy:
       matrix:
         include:
-          - distro: 'rockylinux8'
-            command: '/usr/sbin/init'
-          - distro: 'ubuntu2004'
-            command: '/lib/systemd/systemd'
-          - distro: 'debian11'
-            command: '/lib/systemd/systemd'
+          - distro: 'debian-11'
+          - distro: 'rockylinux-8'
+          - distro: 'ubuntu-22.04'
 
     steps:
       - name: 'Checkout the codebase'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: 'Test role'
         uses: gofrolist/molecule-action@v2
@@ -33,4 +29,3 @@ jobs:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'
           MOLECULE_DISTRO: ${{ matrix.distro }}
-          MOLECULE_DOCKER_COMMAND: ${{ matrix.command }}

README.md

@@ -9,7 +9,23 @@ Requirements
 - Supported version of Ansible: 2.9 and highter.
 - `gnu-tar` on Mac as deployer host (`brew install gnu-tar`).
 - `pywinrm` is a python library for connection Ansible to Windows hosts via [WinRM](https://docs.ansible.com/ansible/latest/user_guide/windows_winrm.html).
-- List of all supported platforms described in role meta.
+- Supported platforms:
+  - Amazon Linux
+    - all
+  - Debian
+    - 10
+    - 11
+  - RHEL
+    - 7
+    - 8
+  - Ubuntu
+    - 18.04
+    - 20.04
+    - 22.04
+  - Windows
+    - 2016
+    - 2019
+    - 2022
 
 Role Variables
 --------------

handlers/main.yml

@@ -2,5 +2,6 @@
 - name: 'Linux | Restart Postgres Exporter'
   ansible.builtin.systemd:
     name: postgres_exporter
+    daemon_reload: true
     state: restarted
   become: true

meta/main.yml

@@ -10,6 +10,13 @@ galaxy_info:
   min_ansible_version: '2.9'
 
   platforms:
+    - name: Amazon Linux
+      versions:
+        - 'all'
+    - name: Debian
+      versions:
+        - 'buster'
+        - 'bullseye'
     - name: EL
       versions:
         - '7'
@@ -18,17 +25,16 @@ galaxy_info:
       versions:
         - 'bionic'
         - 'focal'
-    - name: Debian
-      versions:
-        - 'bullseye'
+        - 'jammy'
     - name: Windows
       versions:
         - '2016'
         - '2019'
+        - '2022'
 
   galaxy_tags:
     - monitoring
     - prometheus
-    - postgres_exporter
+    - postgresql
 
 dependencies: []

molecule/default/molecule.yml

@@ -7,10 +7,10 @@ driver:
 lint: |
   set -e
   yamllint .
+  ansible-lint
 platforms:
   - name: instance
-    image: 'geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest'
-    command: "${MOLECULE_DOCKER_COMMAND:-'/lib/systemd/systemd'}"
+    image: 'antmelekhin/docker-systemd:${MOLECULE_DISTRO:-ubuntu-20.04}'
     published_ports:
       - 0.0.0.0:9187:9187/udp
       - 0.0.0.0:9187:9187/tcp
@@ -23,6 +23,6 @@ platforms:
 provisioner:
   name: ansible
   playbooks:
-    verify: ../resources/tests/verify.yml
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
 verifier:
   name: ansible

molecule/resources/tests/verify.yml molecule/default/verify.ymlmolecule/resources/tests/verify.yml renamed to molecule/default/verify.yml

@@ -1,11 +1,13 @@
 ---
 dependency:
   name: galaxy
+  enabled: true
 driver:
   name: vagrant
 lint: |
   set -e
   yamllint .
+  ansible-lint
 platforms:
   - name: instance
     box: 'jborean93/WindowsServer2019'
@@ -28,6 +30,6 @@ provisioner:
         ansible_winrm_server_cert_validation: ignore
         ansible_become: false
   playbooks:
-    verify: ../resources/tests/win_verify.yml
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
 verifier:
   name: ansible