Unify remap user tasks from os_setup role

roles/os_setup/tasks/main.yml

@@ -7,13 +7,9 @@
   include_tasks: powertools.yml
   when: enable_powertools
 
-- name: Include remap_user task for RHEL8
-  include_tasks: remap_user/centos8.yml
-  when: enable_remap_user and ansible_os_family == "RedHat" and ansible_distribution_major_version == '8'
-
-- name: Include remap_user task for RHEL9
-  include_tasks: remap_user/rhel9.yml
-  when: enable_remap_user and ansible_os_family == "RedHat" and ansible_distribution_major_version == '9'
+- name: Include remap_user task
+  include_tasks: remap_user.yml
+  when: enable_remap_user and ansible_os_family == "RedHat"
 
 - name: Create user task
   include_tasks: create_user.yml

roles/os_setup/tasks/remap_user/rhel9.yml → roles/os_setup/tasks/remap_user.yml

@@ -1,7 +1,6 @@
 ---
-# Rocky9 uses GID 999 and UID 999
-# both of which we need to map to the galaxy user and group.
-
+# RHEL uses GID 999 and UID 999, both of which need to be
+# mapped to the galaxy user and group.
 
 - name: Get all groups
   getent:
@@ -18,9 +17,9 @@
     - name: Check for GID 999 group
       ansible.builtin.shell:
         cmd: grep 999 /etc/group
-      ignore_errors: true
       register: check_group
       changed_when: false
+      failed_when: check_group.rc not in (0, 1)
 
     - name: Print return information from the previous task
       ansible.builtin.debug:
@@ -48,11 +47,11 @@
     - name: Check for UID 999 in user file
       ansible.builtin.shell:
         cmd: grep 999 /etc/passwd
-      ignore_errors: true
       register: check_user
       changed_when: false
+      failed_when: check_user.rc not in (0, 1)
 
-    - name: Print return information from the previous task2
+    - name: Print return information from the previous task
       ansible.builtin.debug:
         var: check_user
       when: debug