Skip to content
Snippets Groups Projects
Commit d9aeb154 authored by nimrod's avatar nimrod
Browse files

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

# Conflicts:
#	.travis.yml
#	molecule.yml
#	tasks/main.yml
#	tests/playbook.yml
parents 3acd8576 99a23d7d
Branches
No related tags found
No related merge requests found
--- ---
language: python language: python
python: "2.7" python: ["2.7", "3.4"]
dist: trusty dist: trusty
sudo: True sudo: True
group: beta group: beta
env: env:
- platform: openbsd60 - platform: openbsd60
driver: vagrant driver: vagrant
- &openbsd59 - &openbsd59 platform=openbsd59 driver=vagrant
platform: openbsd59
driver: vagrant
- platform: openbsd56 - platform: openbsd56
driver: vagrant driver: vagrant
matrix: matrix:
fast_finish: True
allow_failures:
- python: "3.4"
- env: *openbsd59 - env: *openbsd59
cache: cache:
- pip - pip
......
--- ---
# tasks file for openbsd-bootstrap # tasks file for openbsd-bootstrap
- name: Check if sudo is available - name: Check if sudo is available
raw: 'which sudo > /dev/null 2>/dev/null && echo sudo || echo doas' raw: 'which sudo > /dev/null 2>/dev/null && echo sudo || echo doas'
changed_when: False changed_when: False
......
...@@ -2,7 +2,7 @@ ansible==2.2.0.0 ...@@ -2,7 +2,7 @@ ansible==2.2.0.0
testinfra==1.5.1 testinfra==1.5.1
molecule==1.17.3 molecule==1.17.3
ansible-lint==3.4.9 ansible-lint==3.4.9
pre-commit==0.9.4 pre-commit==0.10.1
piprot==0.9.7 piprot==0.9.7
python-vagrant==0.5.14 python-vagrant==0.5.14
docker-py==1.10.6 docker-py==1.10.6
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment