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

# Conflicts:
#	meta/main.yml
#	molecule.yml
#	tasks/main.yml
#	tests/test_example.py

.molecule/group_vars/all

-five: 5
-six: 6
-eleven: '{{ five + six }}'

.pre-commit-config.yaml

 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    sha: 6dfcb89af3c9b4d172cc2e5a8a2fa0f54615a338
+    sha: 7539d8bd1a00a3c1bfd34cdb606d3a6372e83469
     hooks:
     -   id: check-added-large-files
     -   id: check-json
     -   id: check-xml
     -   id: check-yaml
     -   id: check-merge-conflict
--   repo: https://www.shore.co.il/git/ansible-pre-commit/
-    sha: 94b506c144d4e22ebc1deef637a818db13bcaca5
+-   repo: https://www.shore.co.il/git/ansible-pre-commit
+    sha: v0.4.0
     hooks:
-    -   id: ansible-pre-commit
+    -   id: ansible-syntax-check
+        always_run: true
+        files: tests/playbook.yml
+        args: ['tests/playbook.yml']
+-   repo: https://github.com/willthames/ansible-lint
+    sha: v3.4.4
+    hooks:
+    -   id: ansible-lint
+        always_run: true
+        files: tests/playbook.yml
+        args: ['tests/playbook.yml']

README.rst

@@ -30,7 +30,7 @@ To install the dependencies:
 
 .. code:: shell
 
-    ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD)
+    ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles
 
 To run the full test suite:
 

ansible.cfg

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

molecule.yml

@@ -21,3 +21,6 @@ vagrant:
         append_platform_to_hostname: yes
   raw_config_args:
   - 'vm.synced_folder ".", "/vagrant", disabled: true'
+  - 'vbguest.auto_update = false'
+  - 'landrush.enabled = false'
+  - 'landrush_ip.override = false'

tasks/main.yml

 ---
 # tasks file for ansible-role-ufw
-
-- name: Assert
+- name: Assertions
   assert:
     that: ansible_pkg_mgr == 'apt'
 

tests/test_example.py

+def test_example(Command):
+    assert Command('uname').rc == 0
+
+
+def test_root(Command, Sudo):
+    with Sudo():
+        assert Command('whoami').stdout == 'root'