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

.travis.yml

+6 −5
Original line number Diff line number Diff line 
---

language: python

python: "2.7"

python: ["2.7", "3.4"]

dist: trusty

sudo: True

group: beta

env:

    - platform: openbsd60

      driver: vagrant

    - &openbsd59

      platform: openbsd59

      driver: vagrant

    - &openbsd59 platform=openbsd59 driver=vagrant

    - platform: openbsd56

      driver: vagrant

matrix:

    fast_finish: True

    allow_failures:

        - python: "3.4"

        - env: *openbsd59

cache:

  - pip

tasks/main.yml

+1 −0
Original line number Diff line number Diff line 
---

# tasks file for openbsd-bootstrap



- name: Check if sudo is available

  raw: 'which sudo > /dev/null 2>/dev/null && echo sudo || echo doas'

  changed_when: False

tests/requirements.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ ansible==2.2.0.0 
testinfra==1.5.1

molecule==1.17.3

ansible-lint==3.4.9

pre-commit==0.9.4

pre-commit==0.10.1

piprot==0.9.7

python-vagrant==0.5.14

docker-py==1.10.6