From fbe39f3a3ce8ea993f31a19895858c95c123e26e Mon Sep 17 00:00:00 2001
From: Kevin Coakley <kcoakley@sdsc.edu>
Date: Wed, 20 May 2020 07:14:41 -0700
Subject: [PATCH] Refactored Molecule tests

---
 molecule/default/converge.yml |  7 +++++++
 molecule/default/molecule.yml | 11 +++++------
 molecule/default/playbook.yml | 13 -------------
 molecule/default/verify.yml   | 10 ++++++++++
 4 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100644 molecule/default/converge.yml
 delete mode 100644 molecule/default/playbook.yml
 create mode 100644 molecule/default/verify.yml

diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
new file mode 100644
index 0000000..f90331d
--- /dev/null
+++ b/molecule/default/converge.yml
@@ -0,0 +1,7 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  roles:
+    - role: ansible-role-facter
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 7481fd7..bb5d5fb 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -18,13 +18,12 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
+  log: false
+  options:
+    vvv: false
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
 scenario:
   name: default
 verifier:
-  name: testinfra
-  lint:
-    name: flake8
+  name: ansible
diff --git a/molecule/default/playbook.yml b/molecule/default/playbook.yml
deleted file mode 100644
index 85a02a9..0000000
--- a/molecule/default/playbook.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: true
-
-  roles:
-    - role: ansible-role-facter
-
-  post_tasks:
-    - name: Fail if facter_facterversion is not defined
-      fail:
-        msg: Facter is Not Working
-      when: facter_facterversion is not defined
diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
new file mode 100644
index 0000000..5c2fd2a
--- /dev/null
+++ b/molecule/default/verify.yml
@@ -0,0 +1,10 @@
+---
+- name: Verify
+  hosts: all
+  become: true
+
+  tasks:
+  - name: Fail if facter_facterversion is not defined
+    fail:
+      msg: Facter is Not Working
+    when: facter_facterversion is not defined