item.group takes precedence when defined

Author: Colin Hoglund

README.md

@@ -33,6 +33,7 @@ The following attributes are required for each user:
   uid will be used
 * password - If a hash is provided then that will be used, but otherwise the
   account will be locked
+* group - optional primary group override
 * groups - a list of supplementary groups for the user.
 * profile - a string block for setting custom shell profiles
 * ssh-key - This should be a list of ssh keys for the user. Each ssh key

tasks/main.yml

@@ -8,13 +8,13 @@
   group: name="{{item.username}}"
          gid="{{item.gid if item.gid is defined else item.uid}}"
   with_items: "{{users}}"
-  when: users_create_per_user_group
+  when: 'group' not in item and users_create_per_user_group
   tags: ['users','configuration']
 
 - name: User creation
   user:
     name: "{{item.username}}"
-    group: "{{item.username if users_create_per_user_group else users_group}}"
+    group: "{{item.group | default(item.username if users_create_per_user_group else users_group)}}"
     # empty string removes user from all secondary groups
     groups: "{{item.groups | join(',') if 'groups' in item else ''}}"
     shell: "{{item.shell if item.shell is defined else users_default_shell}}"
@@ -41,7 +41,7 @@
     block: "{{item.profile}}"
     dest: "{{ item.home | default('/home/' + item.username) }}/.profile"
     owner: "{{item.username}}"
-    group: "{{item.username if users_create_per_user_group else users_group}}"
+    group: "{{item.group | default(item.username if users_create_per_user_group else users_group)}}"
     mode: 0644
     create: true
   when: users_create_homedirs and item.profile is defined