Commit 5f2dedc5 authored by nimrod's avatar nimrod
Browse files

Merge branch 'master' of https://www.shore.co.il/git/ansible-role-example 

# Conflicts:
#	meta/main.yml
#	molecule.yml
#	tasks/main.yml
#	tests/test_example.py
parents 822d2354 b8be0e68

.molecule/group_vars/all

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
five: 5

six: 6

eleven: '{{ five + six }}'

.pre-commit-config.yaml

+5 −0
Original line number Diff line number Diff line
@@ -10,3 +10,8 @@ 
    sha: 94b506c144d4e22ebc1deef637a818db13bcaca5

    hooks:

    -   id: ansible-pre-commit

-   repo: https://github.com/willthames/ansible-lint.git

    sha: v3.3.3

    hooks:

    -   id: ansible-lint

        files: \.(yaml|yml)$

README.rst

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,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

+1 −1
Original line number Diff line number Diff line 
[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

+4 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ vagrant: 
    type: virtualbox

  platforms:

  - name: openbsd

    box: kaorimatz/openbsd-5.9-amd64

    box: kaorimatz/openbsd-6.0-amd64

  - name: debian

    box: debian/jessie64

  instances:
@@ -23,3 +23,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'