Merge pull request #39 from zz9pzza/issue_38

Error when users_create_per_user_group is false

Author: Colin Hoglund

.travis.yml

@@ -23,5 +23,22 @@ script:
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
+  # Lets check on the state of the users. I would invoke severspec myself however
+  # its a big thing to bring in on a small pull.
+  - id ansibletestuser  | grep --silent "uid=2222(ansibletestuser) gid=2222(ansibletestuser) groups=2222(ansibletestuser),2(bin),100(users)"
+  - id ansibletestuser2 | grep --silent "uid=2223(ansibletestuser2) gid=2223(ansibletestuser2) groups=2223(ansibletestuser2),2(bin),100(users)"
+  - id ansibletestuser3 | grep --silent "uid=2224(ansibletestuser3) gid=4000(ansibletestgroup) groups=4000(ansibletestgroup),2(bin),100(users)"
+  - id ansibletestuser4 | grep --silent "uid=2225(ansibletestuser4) gid=100(users) groups=100(users),2(bin)"
+  - grep --silent "^ansibletestgroup:"  /etc/group
+  - grep --silent "^ansibletestgroup1:" /etc/group
+  - ls -lgd /home/ansibletestuser  | awk '{exit $3!="ansibletestuser"}'
+  - ls -lgd /home/otherdirectory   | awk '{exit $3!="ansibletestuser2"}'
+  - ls -lgd /home/ansibletestuser3 | awk '{exit $3!="ansibletestgroup"}'
+  - ls -lgd /home/otherdirectory1  | awk '{exit $3!="users"}'
+  - ls -lg /home/ansibletestuser/.profile  | awk '{exit $3!="ansibletestuser"}'
+  - ls -lg /home/otherdirectory/.profile   | awk '{exit $3!="ansibletestuser2"}'
+  - ls -lg /home/ansibletestuser3/.profile | awk '{exit $3!="ansibletestgroup"}'
+  - ls -lg /home/otherdirectory1/.profile  | awk '{exit $3!="users"}'
+
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/

tasks/main.yml

@@ -41,7 +41,7 @@
     block: "{{item.profile}}"
     dest: "{{ item.home | default('/home/' + item.username) }}/.profile"
     owner: "{{item.username}}"
-    group: "{{item.username}}"
+    group: "{{item.username if users_create_per_user_group else users_group}}"
     mode: 0644
     create: true
   when: users_create_homedirs and item.profile is defined

tests/test.yml

@@ -3,6 +3,9 @@
 - hosts: localhost
   remote_user: root
   vars:
+    groups_to_create:
+      - name: ansibletestgroup
+        gid: 4000
     users:
       - name: Ansible Test User
         username: ansibletestuser
@@ -36,3 +39,48 @@
 
   roles:
     - ansible-users
+
+- hosts: localhost
+  remote_user: root
+  vars:
+    users_create_per_user_group: false
+    users_group: ansibletestgroup
+    groups_to_create:
+      - name: ansibletestgroup1
+        gid: 4001
+    users:
+      - name: Ansible Test User3
+        username: ansibletestuser3
+        uid: 2224
+        group: ansibletestgroup1
+        groups: [users, bin]
+        shell: /bin/sh
+        profile: |
+          alias ll='ls -lah'
+          alias cp='cp -iv'
+        ssh_key:
+          - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVpUJQCOaPg3p5xro9e+1fkGRWNOGrrExiKMqTE91Fwu349bxfMnMzRS0PAERouR9EEL+Ee4Yzhav/uNc35eCtXzACtluXnAncMrQj6pM3IqASynhvXTygHljmcMbBSDQtLrTZeW+YzIcOgk5UM1yBi26WoUYva2aCr9IRvKdYreAK08OiMdZedpOye0ZdvIYJGcyITwc6YMmrAhP7jZlrk/mDEkf2a4eBp+475o7MJtaC9npqYkToM8vqvx5AGEKqXt7/f1/paOY7KsR+VGPQy6k2RkXjWBsXPesZ3d3XLZHE60wAk0EsuJO8A25+uWSB6ILQeRSYYmGea/WIf6kd [email protected]"
+
+  roles:
+    - ansible-users
+
+- hosts: localhost
+  remote_user: root
+  vars:
+    users_create_per_user_group: false
+    users_group: users
+    users:
+      - name: Ansible Test User4
+        username: ansibletestuser4
+        uid: 2225
+        groups: [users, bin]
+        shell: /bin/sh
+        home: /home/otherdirectory1
+        profile: |
+          alias ll='ls -lah'
+          alias cp='cp -iv'
+        ssh_key:
+          - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVpUJQCOaPg3p5xro9e+1fkGRWNOGrrExiKMqTE91Fwu349bxfMnMzRS0PAERouR9EEL+Ee4Yzhav/uNc35eCtXzACtluXnAncMrQj6pM3IqASynhvXTygHljmcMbBSDQtLrTZeW+YzIcOgk5UM1yBi26WoUYva2aCr9IRvKdYreAK08OiMdZedpOye0ZdvIYJGcyITwc6YMmrAhP7jZlrk/mDEkf2a4eBp+475o7MJtaC9npqYkToM8vqvx5AGEKqXt7/f1/paOY7KsR+VGPQy6k2RkXjWBsXPesZ3d3XLZHE60wAk0EsuJO8A25+uWSB6ILQeRSYYmGea/WIf6kd [email protected]"
+
+  roles:
+    - ansible-users