Merge pull request #32 from singleplatform-eng/revert-31-master

Revert "Merge SinglePlatform changes"

Author: Colin Hoglund

.travis.yml

@@ -1,27 +1,9 @@
----
-sudo: required
 language: python
-python: "2.7"
-
+python:
+  - "2.7"
 install:
-  - pip install ansible
-
-  # Add ansible.cfg to pick up roles path.
-  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
-
+  - "pip install ansible"
 script:
-  # Syntax Check
-  - ansible-playbook -i localhost, tests/test.yml --syntax-check
-
-  # Run test.yml
-  - ansible-playbook -i localhost, --connection=local --sudo tests/test.yml
-
-  # Run the role/playbook again, checking to make sure it's idempotent.
-  - >
-    ansible-playbook -i localhost, --connection=local --sudo tests/test.yml
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  - cd tests
+  - ansible-playbook --connection=local --limit=localhost --inventory-file=hosts all.yml
 
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/

README.md

@@ -1,6 +1,6 @@
-[![Build Status](https://travis-ci.org/singleplatform-eng/ansible-users.svg?branch=master)](https://travis-ci.org/singleplatform-eng/ansible-users)
+[![Build Status](https://travis-ci.org/mivok/ansible-users.png)](https://travis-ci.org/mivok/ansible-users)
 
-# ansible-users
+# Users role
 
 Role to manage users on a system.
 
@@ -31,7 +31,6 @@ The following attributes are required for each user:
 * password - If a hash is provided then that will be used, but otherwise the
   account will be locked
 * 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
   should be included directly and should have no newlines.
 
@@ -49,14 +48,9 @@ Example:
         name: Foo Barrington
         groups: ['wheel','systemd-journal']
         uid: 1001
-        profile: |
-          alias ll='ls -lah'
         ssh_key:
           - "ssh-rsa AAAAA.... foo@machine"
           - "ssh-rsa AAAAB.... foo2@machine"
-    groups_to_create:
-      - name: developers
-        gid: 10000
     users_deleted:
       - username: bar
         name: Bar User

defaults/main.yml

@@ -13,10 +13,4 @@ users_create_homedirs: true
 # Lists of users to create and delete
 users: []
 users_deleted: []
-
-# List of groups to create
-# Example:
-#   groups_to_create:
-#     - name: developers
-#       gid: 10000
 groups_to_create: []

meta/main.yml

@@ -1,37 +1,36 @@
 ---
 galaxy_info:
-  author: Mark Harrison (Modified by SinglePlatform Engineering)
+  author: Mark Harrison
   description: User creation role
   license: MIT
   min_ansible_version: 1.3
   platforms:
-    - name: EL
-      versions:
-        - all
-    - name: GenericUNIX
-      versions:
-        - all
-        - any
-    - name: Fedora
-      versions:
-        - all
-    - name: opensuse
-      versions:
-        - all
-    - name: Ubuntu
-      versions:
-        - all
-    - name: SLES
-      versions:
-        - all
-    - name: GenericLinux
-      versions:
-        - all
-        - any
-    - name: Debian
-      versions:
-        - all
-  galaxy_tags:
-    - system
-
+  - name: EL
+    versions:
+    - all
+  - name: GenericUNIX
+    versions:
+    - all
+    - any
+  - name: Fedora
+    versions:
+    - all
+  - name: opensuse
+    versions:
+    - all
+  - name: Ubuntu
+    versions:
+    - all
+  - name: SLES
+    versions:
+    - all
+  - name: GenericLinux
+    versions:
+    - all
+    - any
+  - name: Debian
+    versions:
+    - all
+  categories:
+  - system
 dependencies: []

tasks/main.yml

@@ -1,54 +1,42 @@
 ---
 - name: Creating groups
-  group: name="{{item.name}}" gid="{{item.gid | default(omit)}}"
-  with_items: "{{groups_to_create}}"
+  group: name="{{item}}"
+  with_items: groups_to_create
   tags: ['users','groups','configuration']
 
 - name: Per-user group creation
   group: name="{{item.username}}" gid="{{item.uid}}"
-  with_items: "{{users}}"
+  with_items: users
   when: 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}}"
-    # 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}}"
-    password: "{{item.password if item.password is defined else '!'}}"
-    comment: "{{item.name}}"
-    uid: "{{item.uid}}"
-    createhome: "{{'yes' if users_create_homedirs else 'no'}}"
-  with_items: "{{users}}"
+  user: name="{{item.username}}"
+        group="{{item.username if users_create_per_user_group
+            else users_group}}"
+        groups="{{item.groups | join(',')}}"
+        shell={{item.shell if item.shell is defined else users_default_shell}}
+        password="{{item.password if item.password is defined else '!'}}"
+        comment="{{item.name}}"
+        uid="{{item.uid}}"
+        createhome="{{'yes' if users_create_homedirs else 'no'}}"
+  with_items: users
   tags: ['users','configuration']
 
 - name: SSH keys
   authorized_key: user="{{item.0.username}}" key="{{item.1}}"
   with_subelements:
-    - "{{users}}"
+    - users
     - ssh_key
   tags: ['users','configuration']
 
-- name: Setup user profiles
-  blockinfile:
-    block: "{{item.profile}}"
-    dest: "/home/{{item.username}}/.profile"
-    owner: "{{item.username}}"
-    group: "{{item.username}}"
-    mode: 0644
-    create: true
-  when: users_create_homedirs and item.profile is defined
-  with_items: "{{users}}"
-
 - name: Deleted user removal
   user: name="{{item.username}}" state=absent
-  with_items: "{{users_deleted}}"
+  with_items: users_deleted
   tags: ['users','configuration']
 
 - name: Deleted per-user group removal
   group: name="{{item.username}}" state=absent
-  with_items: "{{users_deleted}}"
+  with_items: users_deleted
   when: users_create_per_user_group
   tags: ['users','configuration']

tests/add_user.yml

@@ -0,0 +1,52 @@
+---
+
+# It should add a user when given valid metadata
+
+- hosts: test_runners
+  sudo: yes
+
+# Test fixture data
+  vars:
+    users:
+      - username: ansibletestuser
+        name: Ansible Users Role Test Fixture Account
+        groups:
+          - 'users'
+          - 'bin'
+        uid: 2222
+        ssh_key:
+          - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVpUJQCOaPg3p5xro9e+1fkGRWNOGrrExiKMqTE91Fwu349bxfMnMzRS0PAERouR9EEL+Ee4Yzhav/uNc35eCtXzACtluXnAncMrQj6pM3IqASynhvXTygHljmcMbBSDQtLrTZeW+YzIcOgk5UM1yBi26WoUYva2aCr9IRvKdYreAK08OiMdZedpOye0ZdvIYJGcyITwc6YMmrAhP7jZlrk/mDEkf2a4eBp+475o7MJtaC9npqYkToM8vqvx5AGEKqXt7/f1/paOY7KsR+VGPQy6k2RkXjWBsXPesZ3d3XLZHE60wAk0EsuJO8A25+uWSB6ILQeRSYYmGea/WIf6kd [email protected]"
+
+# Test setup
+  pre_tasks:
+    - include: cleanup.yml
+    - name: Add Users Test | Pre-Assertions | Ensure ansibletestuser not already present
+      command: "grep ansibletestuser /etc/passwd /etc/group"
+      register: ensure_user_not_present
+      failed_when: ensure_user_not_present.rc == 0
+    - name: Add Users Test | Pre-Assertions | Ensure ansibletestuser home dir not already present
+      command: "ls -d /home/ansibletestuser"
+      register: ensure_home_not_present
+      failed_when: ensure_home_not_present.rc == 0
+
+# Test run
+  roles:
+    - { role: users }
+
+# Test verify successful
+  tasks:
+    - name: Add Users Test | Post-Assertions | Ensure ansibletestuser was created
+      command: "grep ansibletestuser /etc/passwd"
+    - name: Add Users Test | Post-Assertions | Ensure ansibletestuser home dir was created
+      command: "ls -d /home/ansibletestuser"
+    - name: Add Users Test | Post-Assertions | Ensure ssh key was added
+      command: "sudo grep '{{ users[0].ssh_key[0] }}' /home/ansibletestuser/.ssh/authorized_keys"
+    - name: Add Users Test | Post-Assertions | Ensure group was added
+      command: "grep 2222 /etc/group"
+    - name: Add Users Test |  Post-Assertions | Ensure user was added to requested groups
+      command: "grep '^bin.*ansibletestuser' /etc/group"
+
+# Test tear-down
+  post_tasks:
+    - include: cleanup.yml
+

tests/all.yml

@@ -0,0 +1,7 @@
+---
+
+# All users role tests
+
+- include: add_user.yml
+- include: ssh_keys_optional.yml
+

tests/cleanup.yml

@@ -0,0 +1,8 @@
+---
+
+- name: Cleanup | Remove ansibletestuser
+  user: state="absent" name="ansibletestuser"
+
+- name: Cleanup | Remove ansibletestuser home dir
+  file: state="absent" path="/home/ansibletestuser"
+

tests/hosts

@@ -0,0 +1,3 @@
+[test_runners]
+localhost
+

tests/roles/users

@@ -0,0 +1 @@
+../../