Commit d4a6b634 authored by nimrod's avatar nimrod
Browse files

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

# Conflicts:
#	molecule.yml
parents ed8b6de9 d5ce1eab

molecule.yml

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ vagrant: 
    box: ubuntu/trusty32

  - name: precise

    box: hashicorp/precise32

  - name: stretch

    box: koalephant/debian9-i386

  - name: jessie

    box: deb/jessie-i386

  - name: wheezy

tests/requirements.txt

+3 −3
Original line number Diff line number Diff line 
ansible==2.3.0.0

testinfra==1.6.3

molecule==1.24.0

ansible==2.3.1.0

testinfra==1.6.4

molecule==1.25.0

ansible-lint==3.4.13

python-vagrant==0.5.15

netaddr==0.7.19