Merge branch 'master' of /home/nimrod/Documents/Shore/Ansible/example

# Conflicts:
#	.travis.yml
#	molecule.yml
#	tasks/main.yml
#	tests/playbook.yml

.pre-commit-config.yaml

@@ -9,7 +9,7 @@
     -   id: flake8
     -   id: check-symlinks
 -   repo: https://github.com/adarnimrod/ansible-pre-commit.git
-    sha: 0fadd691465b97db8992cfc66650f630e433324b
+    sha: v0.5.0
     hooks:
     -   id: ansible-syntax-check
         always_run: true
@@ -30,6 +30,6 @@
         name: piprot
         description: Check up-to-date Python requirements
         language: system
-        entry: piprot --quiet --outdated tests/requirements.txt
+        entry: piprot --outdated tests/requirements.txt
         files: requirements.txt
         always_run: true

.travis.yml

 ---
 language: python
-python: ["2.7", "3.4"]
+python: ["2.7", "3.5"]
 dist: trusty
 sudo: True
 group: beta
 env:
     - platform: openbsd60
-      driver: vagrant
-    - &openbsd59 platform=openbsd59 driver=vagrant
+    - &openbsd59 platform=openbsd59
     - platform: openbsd56
-      driver: vagrant
 matrix:
     fast_finish: True
     allow_failures:
-        - python: "3.4"
+        - python: "3.5"
         - env: *openbsd59
 cache:
   - pip
@@ -31,7 +29,7 @@ install:
 
 script:
   - pre-commit run --all-files
-  - molecule test --driver $driver --platform $platform
+  - molecule test --platform $platform
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/

README.rst

@@ -29,9 +29,8 @@ See :code:`tests/playbook.yml`.
 Testing
 -------
 
-Testing requires Python 2.7 and either Docker or Vagrant and Virtualbox.
-Install the Python dependencies, dependent roles and roles required for
-testing:
+Testing requires Python 2.7, Vagrant and Virtualbox. Install the Python
+dependencies, dependent roles and roles required for testing:
 
 .. code:: shell
 

tests/playbook.yml

@@ -4,12 +4,6 @@
   roles:
     - role: openbsd-bootstrap
   post_tasks:
-      - name: Test gathering facts
-        setup:
-
-      - name: Test ping
-        ping:
-
       - name: Test task with an unprivileged user
         ignore_errors: '{{ ansible_check_mode }}'
         become: True

tests/requirements.txt

 ansible==2.2.1.0
-testinfra==1.5.2
-molecule==1.18.0
+testinfra==1.5.3
+molecule==1.19.1
 ansible-lint==3.4.10
-pre-commit==0.10.1
+pre-commit==0.12.2
 piprot==0.9.7
 python-vagrant==0.5.14
-docker-py==1.10.6
 netaddr==0.7.19
-passlib==1.7.0
+passlib==1.7.1
 bcrypt==3.1.2

tests/requirements.yml

@@ -3,3 +3,5 @@
   name: openbsd-bootstrap
 - src: adarnimrod.debian-bootstrap
   name: debian-bootstrap
+- src: adarnimrod.users
+  name: users