Commit 661a011a 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 ba837878 99a23d7d

.travis.yml

+10 −8
Original line number Diff line number Diff line 
---

language: python

python: "2.7"

python: ["2.7", "3.4"]

dist: trusty

sudo: True

group: beta

services: [docker]

env:

    - platform: openbsd

      driver: vagrant

    - platform: xenial

      driver: vagrant

    - platform: jessie

      driver: vagrant

    - platform: trusty

    - platform: openbsd60

      driver: vagrant

    - &openbsd59 platform=openbsd59 driver=vagrant

    - driver: docker

      platform: all

matrix:

    fast_finish: True

    allow_failures:

        - python: "3.4"

        - env: *openbsd59

cache:

  - pip

  - directories:

molecule.yml

+14 −3
Original line number Diff line number Diff line
@@ -16,14 +16,18 @@ vagrant: 
    options:

        cpus: 1

  platforms:

  - name: openbsd

  - name: openbsd60

    box: fnichol/openbsd-6.0-i386

  - name: openbsd59

    box: fnichol/openbsd-5.9-i386

  - name: xenial

    box: ubuntu/xenial32

  - name: jessie

    box: nogajun/jessie32

  - name: trusty

    box: ubuntu/trusty32

  - name: jessie

    box: debian/jessie32

  - name: wheezy

    box: debian/wheezy32

  instances:

  - name: gitreceive

    options:
@@ -70,3 +74,10 @@ docker: 
    environment:

        DEBIAN_FRONTEND: noninteractive

        container: docker

  - name: gitreceive-wheezy

    image: debian

    image_version: wheezy

    command: /sbin/init

    environment:

        DEBIAN_FRONTEND: noninteractive

        container: docker

tasks/main.yml

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

# tasks file for gitreceive



- name: Assertions

  assert:

    that:

tests/playbook.yml

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

- hosts: gitreceive-openbsd

- hosts: gitreceive-openbsd*

  gather_facts: false

  roles: [openbsd-bootstrap]

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