From a722fd85746f8d4fcf043703f725992ecc7fa3d7 Mon Sep 17 00:00:00 2001
From: shnee <shnee@shnee.net>
Date: Mon, 2 May 2022 14:57:29 -0400
Subject: [PATCH] Added linting to molecule.

---
 meta/main.yml                 | 27 +++++++++------------------
 molecule/default/converge.yml |  2 +-
 molecule/default/molecule.yml |  4 ++++
 molecule/default/verify.yml   |  4 ++--
 tasks/main.yml                |  1 -
 5 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/meta/main.yml b/meta/main.yml
index 10292f4..7646d9d 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,4 +1,6 @@
+---
 galaxy_info:
+
   author: shnee
   namespace: shnee
   description: Retrieves the contents of /etc/os-release
@@ -6,24 +8,13 @@ galaxy_info:
   license: GPL-3.0-only
   min_ansible_version: 2.1
 
-  #
-  # Provide a list of supported platforms, and for each platform a list of versions.
-  # If you don't wish to enumerate all versions for a particular platform, use 'all'.
-  # To view available platforms and versions (or releases), visit:
-  # https://galaxy.ansible.com/api/v1/platforms/
-  #
-  # platforms:
-  # - name: Fedora
-  #   versions:
-  #   - all
-  #   - 25
-  # - name: SomePlatform
-  #   versions:
-  #   - all
-  #   - 1.0
-  #   - 7
-  #   - 99.99
+  platforms:
+  - name: EL
+    versions:
+     - 8
 
-  galaxy_tags: []
+  galaxy_tags:
+    - distro
+    - system
 
 dependencies: []
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 523257d..bd8da10 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -3,5 +3,5 @@
   hosts: all
   tasks:
     - name: "Include shnee.os_release"
-      include_role:
+      ansible.builtin.include_role:
         name: "shnee.os_release"
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index cdb3534..52c4cd9 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -3,6 +3,10 @@ dependency:
   name: galaxy
 driver:
   name: docker
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
 platforms:
   - name: centos-8-stream
     image: quay.io/centos/centos:stream8
diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
index 4b9afcf..763e63b 100644
--- a/molecule/default/verify.yml
+++ b/molecule/default/verify.yml
@@ -24,9 +24,9 @@
   tasks:
 
     - name: Is the OS in exp_vals?
-      assert:
+      ansible.builtin.assert:
         that: exp_vals[ansible_hostname] is defined
     - name: Verify that os-release matches our expected values.
-      assert:
+      ansible.builtin.assert:
         that: os_release[item.key] == item.value
       loop: "{{ exp_vals[ansible_hostname] | dict2items }}"
diff --git a/tasks/main.yml b/tasks/main.yml
index 5abf929..3ca979c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,4 +7,3 @@
       os: linux
       command: cat os-release
     set_fact: os_release
-