Better management of the users removal.

tasks/main.yml

@@ -48,10 +48,10 @@
         group: "{{ item.group | default(omit) }}"
         groups: "{{ item.groups | default(omit) }}"
         append: true
-        comment: "{{ item.name }}"
-        home: "{{ item.home }}/{{ item.login }}"
+        comment: "{{ item.name | default(item.login) }}"
+        createhome: "{{ item.createhome | default(true) }}"
         createhome: "{{ item.createhome }}"
-        shell: "{{ item.shell }}"
+        shell: "{{ item.shell | default('/bin/bash') }}"
         password: "{{ item.password | default('*') }}"
         update_password: "{{ item.update_password | default('on_create') }}"
         state: "{{ item.state | default('present') }}"
@@ -67,7 +67,9 @@
         exclusive: true
         state: present
       loop: '{{ users_system_users }}'
-      when: item.ssh_key is defined
+      when:
+        - item.ssh_key is defined
+        - item.state == "present"
 
     - name: Add the admin users to the sudoers group
       ansible.builtin.user:
@@ -77,6 +79,7 @@
       loop: '{{ users_system_users }}'
       when:
         - item.admin
+        - item.state == "present"
 
 - name: Manage additional users
   tags: users
@@ -87,10 +90,10 @@
         group: "{{ item.group | default(omit) }}"
         groups: "{{ item.groups | default(omit) }}"
         append: true
-        comment: "{{ item.name }}"
+        comment: "{{ item.name | default(item.login) }}"
         home: "{{ item.home }}/{{ item.login }}"
-        createhome: "{{ item.createhome }}"
-        shell: "{{ item.shell }}"
+        createhome: "{{ item.createhome | default(true) }}"
+        shell: "{{ item.shell | default('/bin/bash') }}"
         password: "{{ item.password | default('*') }}"
         update_password: "{{ item.update_password | default('on_create') }}"
         state: "{{ item.state | default('present') }}"
@@ -106,7 +109,9 @@
         exclusive: true
         state: present
       loop: '{{ users_system_users_adjunct }}'
-      when: item.ssh_key is defined
+      when:
+        - item.ssh_key is defined
+        - item.state == "present"
 
     - name: Add the additional admin users to the sudoers group
       ansible.builtin.user:
@@ -116,6 +121,7 @@
       loop: '{{ users_system_users_adjunct }}'
       when:
         - item.admin
+        - item.state == "present"
 
 - name: Configure passwordless sudo
   tags: ['users', 'sudo_wheel']