Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
molecule.yml
+ 2
− 0
View file @ d4a6b634
...@@ -26,6 +26,8 @@ vagrant: ...@@ -26,6 +26,8 @@ vagrant:
box: ubuntu/trusty32 box: ubuntu/trusty32
- name: precise - name: precise
box: hashicorp/precise32 box: hashicorp/precise32
- name: stretch
box: koalephant/debian9-i386
- name: jessie - name: jessie
box: deb/jessie-i386 box: deb/jessie-i386
- name: wheezy - name: wheezy
......
tests/requirements.txt
+ 3
− 3
View file @ d4a6b634
ansible==2.3.0.0 ansible==2.3.1.0
testinfra==1.6.3 testinfra==1.6.4
molecule==1.24.0 molecule==1.25.0
ansible-lint==3.4.13 ansible-lint==3.4.13
python-vagrant==0.5.15 python-vagrant==0.5.15
netaddr==0.7.19 netaddr==0.7.19
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment