From 11b524e33a331e13434ac1dd239fcb9311e42eab Mon Sep 17 00:00:00 2001
From: Ludovic Cartier <ludovic.cartier@brainsys.io>
Date: Tue, 13 Oct 2026 11:26:34 +0200
Subject: [PATCH] create users - fix omit on user groups and append

---
 tasks/user.yml | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/tasks/user.yml b/tasks/user.yml
index 915b051..3fd6506 100644
--- a/tasks/user.yml
+++ b/tasks/user.yml
@@ -13,30 +13,30 @@
 - name: user | create/modify/delete
   user:
     name: '{{ item.name }}'
-    group: '{{ item.group|default(item.name) }}'
-    groups: "{{ item.groups| default([]) | join(',') or omit }}"
-    append: '{{ item.append|default("yes")}}'
-    shell: '{{ item.shell|default("/bin/bash") }}'
-    uid: '{{ item.uid|default(omit) }}'
-    non_unique: '{{ item.non_unique|default(omit) }}'
-    state: '{{ item.state|default("present") }}'
-    comment: '{{ item.comment|default(omit) }}'
-    password: '{{ item.password|default("!") }}'
-    update_password: '{{ item.update_password|default("on_create") }}'
-    system: '{{ item.system|default(omit) }}'
-    home: '{{ item.home|default(omit) }}'
-    createhome: '{{ item.createhome|default(omit) }}'
-    generate_ssh_key: '{{ item.generate_ssh_key|default(omit) }}'
-    ssh_key_file: '{{ item.ssh_key_file|default(omit) }}'
-    ssh_key_passphrase: '{{ item.ssh_key_passphrase|default(omit) }}'
-    ssh_key_type: '{{ item.ssh_key_ssh_key_type|default("rsa") }}'
-    ssh_key_bits: '{{ item.ssh_key_bits|default(omit) }}'
-    ssh_key_comment: '{{ item.ssh_key_comment|default(omit) }}'
-    expires: '{{ item.expires|default(omit) }}'
-    move_home: '{{ item.move_home|default(omit) }}'
-    remove : '{{ item.remove|default(omit) }}'
-  with_items : "{{users_system.user|default([])}}"
-  no_log: "{{no_log|default(true)}}"
+    group: '{{ item.group | default(item.name) }}'
+    groups: "{{ item.groups | default([]) | join(',') or omit }}"
+    append: "{{ item.append | default('yes') if (item.groups is defined and item.groups) else omit }}"
+    shell: '{{ item.shell | default("/bin/bash") }}'
+    uid: '{{ item.uid | default(omit) }}'
+    non_unique: '{{ item.non_unique | default(omit) }}'
+    state: '{{ item.state | default("present") }}'
+    comment: '{{ item.comment | default(omit) }}'
+    password: '{{ item.password | default("!") }}'
+    update_password: '{{ item.update_password | default("on_create") }}'
+    system: '{{ item.system | default(omit) }}'
+    home: '{{ item.home | default(omit) }}'
+    createhome: '{{ item.createhome | default(omit) }}'
+    generate_ssh_key: '{{ item.generate_ssh_key | default(omit) }}'
+    ssh_key_file: '{{ item.ssh_key_file | default(omit) }}'
+    ssh_key_passphrase: '{{ item.ssh_key_passphrase | default(omit) }}'
+    ssh_key_type: '{{ item.ssh_key_ssh_key_type | default("rsa") }}'
+    ssh_key_bits: '{{ item.ssh_key_bits | default(omit) }}'
+    ssh_key_comment: '{{ item.ssh_key_comment | default(omit) }}'
+    expires: '{{ item.expires | default(omit) }}'
+    move_home: '{{ item.move_home | default(omit) }}'
+    remove: '{{ item.remove | default(omit) }}'
+  loop: "{{ users_system.user | default([]) }}"
+  no_log: "{{ no_log | default(true) }}"
   when: ((item.name is defined and item.name != 'root') and (item.state is undefined or (item.state is defined and item.state != 'absent')))
 
 - name: user | ensure home directory mode