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

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

.pre-commit-config.yaml

@@ -6,17 +6,30 @@
     -   id: check-xml
     -   id: check-yaml
     -   id: check-merge-conflict
+    -   id: flake8
+    -   id: check-symlinks
 -   repo: https://www.shore.co.il/git/ansible-pre-commit
-    sha: v0.4.0
+    sha: 0fadd691465b97db8992cfc66650f630e433324b
     hooks:
     -   id: ansible-syntax-check
         always_run: true
         files: tests/playbook.yml
-        args: ['tests/playbook.yml']
+        args:
+        - tests/playbook.yml
 -   repo: https://github.com/willthames/ansible-lint
-    sha: v3.4.4
+    sha: 959ab0f525e9abb19cf75f34381015cf33695f61
     hooks:
     -   id: ansible-lint
         always_run: true
         files: tests/playbook.yml
-        args: ['tests/playbook.yml']
+        args:
+        - tests/playbook.yml
+-   repo: local
+    hooks:
+    -   id: piprot
+        name: piprot
+        description: Check up-to-date Python requirements
+        language: system
+        entry: piprot --quiet --outdated tests/requirements.txt
+        files: requirements.txt
+        always_run: true

README.rst

@@ -6,7 +6,8 @@ Provision Systemd-nspawn.
 Requirements
 ------------
 
-See :code:`meta/main.yml` and assertions at top of :code:`tasks/main.yml`.
+See :code:`meta/main.yml`, :code:`tests/requirements.yml` and assertions at
+the top of :code:`tasks/main.yml`.
 
 Role Variables
 --------------
@@ -26,17 +27,21 @@ See :code:`tests/playbook.yml`.
 Testing
 -------
 
-To install the dependencies:
+Testing requires Virtualbox and Vagrant and Python 2.7. Install the Python
+dependencies, add pre-commit hooks by running:
 
 .. code:: shell
 
-    ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles
+    pip install -r tests/requirements.txt
+    pre-commit install
 
 To run the full test suite:
 
 .. code:: shell
 
-    molecule test
+    ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles
+    molecule test --platform all
+    pre-commit run --all-files
 
 License
 -------

ansible.cfg

 [defaults]
+library = library
 host_key_checking = False
 retry_files_enabled = False
-roles_path = roles:../:../../:.molecule/roles
+roles_path = .molecule/roles:.molecule/../roles:../:../../
 command_warnings = True
 deprecation_warnings = True
+
+[ssh_connection]
+pipelining = True

meta/main.yml

@@ -12,4 +12,4 @@ galaxy_info:
 dependencies:
     - src: https://www.shore.co.il/git/ansible-role-networkd
       scm: git
-      role: networkd
+      name: networkd

molecule.yml

 ---
 ansible:
-  verbose: v
+  verbose: vv
   playbook: tests/playbook.yml
   diff: True
-
-molecule:
-  testinfra_dir: tests
-  ansible_config_template: ansible.cfg
+  config_file: ../ansible.cfg
 
 vagrant:
   providers:

tests/requirements.txt

+ansible==2.2.0.0
+testinfra==1.4.3
+molecule==1.13.0
+ansible-lint==3.4.4
+pre-commit==0.9.3
+piprot==0.9.7

tests/requirements.yml

+---
+- src: https://www.shore.co.il/git/ansible-role-openbsd-bootstrap
+  scm: git
+  name: openbsd_bootstrap
+- src: https://www.shore.co.il/git/ansible-role-debian-bootstrap
+  scm: git
+  name: debian_bootstrap