Commit f936dae0 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 807b3b6f e9dd3345

.pre-commit-config.yaml

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,6 @@ 
        name: piprot

        description: Check up-to-date Python requirements

        language: system

        entry: piprot --quiet --outdated tests/requirements.txt

        entry: piprot --outdated tests/requirements.txt

        files: requirements.txt

        always_run: true

.travis.yml

+2 −2
Original line number Diff line number Diff line 
---

language: python

python: ["2.7", "3.4"]

python: ["2.7", "3.5"]

dist: trusty

sudo: True

group: beta
@@ -14,7 +14,7 @@ env: 
matrix:

    fast_finish: True

    allow_failures:

        - python: "3.4"

        - python: "3.5"

        - env: *openbsd59

cache:

  - pip

molecule.yml

+10 −3
Original line number Diff line number Diff line
@@ -24,10 +24,12 @@ vagrant: 
    box: ubuntu/xenial32

  - name: trusty

    box: ubuntu/trusty32

  - name: precise

    box: hashicorp/precise32

  - name: jessie

    box: debian/jessie32

    box: deb/jessie-i386

  - name: wheezy

    box: debian/wheezy32

    box: bmorg/debian-wheezy-i386

  instances:

  - name: gitreceive

    options:
@@ -62,6 +64,12 @@ docker: 
    environment:

        DEBIAN_FRONTEND: noninteractive

        container: docker

  - name: gitreceive-precise

    image: ubuntu

    image_version: precise

    environment:

        DEBIAN_FRONTEND: noninteractive

        container: docker

  - name: gitreceive-jessie

    image: debian

    image_version: jessie
@@ -77,7 +85,6 @@ docker: 
  - name: gitreceive-wheezy

    image: debian

    image_version: wheezy

    command: /sbin/init

    environment:

        DEBIAN_FRONTEND: noninteractive

        container: docker

tests/playbook.yml

+13 −3
Original line number Diff line number Diff line 
---

- hosts: gitreceive-openbsd*

  gather_facts: false

  roles: [openbsd-bootstrap]

  roles:

      - openbsd-bootstrap

      - role: users

        users: []

        users_use_sudo: True

        users_lock_root_ssh: False



- hosts: gitreceive-xenial

- hosts: [gitreceive-xenial, gitreceive-wheezy]

  gather_facts: false

  roles: [debian-bootstrap]

  roles:

      - debian-bootstrap

      - role: users

        users: []

        users_use_sudo: True

        users_lock_root_ssh: False



- hosts: all

  tasks:

tests/requirements.txt

+6 −6
Original line number Diff line number Diff line 
ansible==2.2.0.0

testinfra==1.5.1

molecule==1.17.3

ansible-lint==3.4.9

pre-commit==0.10.1

ansible==2.2.1.0

testinfra==1.5.2

molecule==1.19.0

ansible-lint==3.4.10

pre-commit==0.11.0

piprot==0.9.7

python-vagrant==0.5.14

docker-py==1.10.6

netaddr==0.7.18

netaddr==0.7.19

passlib==1.7.0

bcrypt==3.1.2