Refactor Ansible tasks and templates for improved consistency and clarity

roles/common/tasks/samba-remove-user.yml

@@ -6,11 +6,15 @@
 
 
 - name: (samba-remove-user.yml) Check if samba user exists for removable system user
-  shell: pdbedit -w -L | awk -F":" '{ print $1 }' | grep '{{ item.name }}'
-  register: samba_remove_system_users_present
-  changed_when: "samba_remove_system_users_present.rc == 0"
-  failed_when: "samba_remove_system_users_present.rc > 1"
-  with_items: 
+  ansible.builtin.shell:
+    cmd: >-
+      set -o pipefail &&
+      pdbedit -w -L | awk -F":" '{ print $1 }' | grep '{{ item.name }}'
+    executable: /bin/bash
+  register: common_samba_remove_system_users_present
+  changed_when: false
+  failed_when: common_samba_remove_system_users_present.rc > 1
+  with_items:
     - "{{ remove_system_users }}"
   loop_control:
     label: '{{ item.name }}'
@@ -19,23 +23,27 @@
 
 
 - name: (samba-remove-user.yml) Remove (old) system users from samba
-  shell: >
-    smbpasswd -s -x {{ item.item.name }}
-  with_items: 
-    - "{{ samba_remove_system_users_present.results }}"
+  ansible.builtin.command: smbpasswd -s -x {{ item.item.name }}
+  changed_when: true
+  with_items:
+    - "{{ common_samba_remove_system_users_present.results }}"
   loop_control:
     label: '{{ item.item.name }}'
-  when: 
-    - item.changed
+  when:
+    - item.rc == 0
   tags:
     - samba-user
 
 
 - name: (samba-remove-user.yml) Check if samba user exists for removable nis user
-  shell: pdbedit -w -L | awk -F":" '{ print $1 }' | grep '{{ item.name }}'
-  register: samba_remove_nis_users_present
-  changed_when: "samba_remove_nis_users_present.rc == 0"
-  failed_when: "samba_remove_nis_users_present.rc > 1"
+  ansible.builtin.shell:
+    cmd: >-
+      set -o pipefail &&
+      pdbedit -w -L | awk -F":" '{ print $1 }' | grep '{{ item.name }}'
+    executable: /bin/bash
+  register: common_samba_remove_nis_users_present
+  changed_when: false
+  failed_when: common_samba_remove_nis_users_present.rc > 1
   with_items:
     - "{{ remove_nis_users }}"
   loop_control:
@@ -45,13 +53,13 @@
 
 
 - name: (samba-remove-user.yml) Remove (old) nis users from samba
-  shell: >
-    smbpasswd -s -x {{ item.item.name }}
+  ansible.builtin.command: smbpasswd -s -x {{ item.item.name }}
+  changed_when: true
   with_items:
-    - "{{ samba_remove_nis_users_present.results }}"
+    - "{{ common_samba_remove_nis_users_present.results }}"
   loop_control:
     label: '{{ item.item.name }}'
   when:
-    - item.changed
+    - item.rc == 0
   tags:
     - samba-user