From e9a390c693feaa0681685272571ad88e6f306213 Mon Sep 17 00:00:00 2001
From: Mark Bolwell <mark.bollyuk@gmail.com>
Date: Thu, 13 Jan 2022 11:40:59 +0000
Subject: [PATCH] updated checks to assertions

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
---
 tasks/main.yml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 123858a..89e9ffc 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,25 +1,29 @@
 ---
 # tasks file for RHEL9-CIS
 - name: Check OS version and family
-  fail:
-      msg: "This role can only be run against RHEL 8 or 9. {{ ansible_distribution }} {{ ansible_distribution_major_version }} is not supported."
-  when:
-  - ansible_os_family == 'RedHat'
-  - ansible_distribution_major_version == 8 or
-    ansible_distribution_major_version == 9
+  assert:
+      that:
+          - ansible_os_family == 'RedHat'
+          - ansible_distribution_major_version |int >= 8
+      fail_msg: "This role can only be run against RHEL 8 or 9. {{ ansible_distribution }} {{ ansible_distribution_major_version }} is not supported."
+      success_msg: "Supported OS release and version"
   tags:
   - always
 
 - name: Check ansible version
-  fail:
-      msg: You must use ansible 2.9 or greater
-  when: not ansible_version.full is version_compare('2.9', '>=')
+  assert:
+      that:
+          - "ansible_version.full is version_compare ('2.9', '>=')"
+      fail_msg: "You must use ansible 2.9 or greater"
+      success_msg: "Supported ansible_version"
   tags:
   - always
 
 - name: Check crypto-policy input
   assert:
       that: rhel9cis_crypto_policy in rhel9cis_allowed_crypto_policies
+      fail_msg: "Crypto policy is not a permitted version"
+      success_msg: "Crypto policy is a permitted version"
 
 - name: Check rhel9cis_bootloader_password_hash variable has been changed
   assert: