Commit ba837878 authored by nimrod's avatar nimrod
Browse files

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

# Conflicts:
#	molecule.yml
#	tests/playbook.yml
parents cc5919f3 0390260e

.travis.yml

+15 −2
Original line number Diff line number Diff line
@@ -2,22 +2,35 @@ 
language: python

python: "2.7"

dist: trusty

sudo: false

sudo: True

group: beta

services: [docker]

env:

    - platform: openbsd

      driver: vagrant

    - platform: xenial

      driver: vagrant

    - platform: jessie

      driver: vagrant

    - platform: trusty

      driver: vagrant

cache:

  - pip

  - directories:

      - $HOME/.pre-commit



install:

  - sudo apt-get update

  - sudo apt-get install -y linux-headers-$(uname -r) virtualbox

  - wget https://releases.hashicorp.com/vagrant/1.9.1/vagrant_1.9.1_x86_64.deb

  - sudo dpkg -i vagrant_1.9.1_x86_64.deb

  - pip install -r tests/requirements.txt | cat

  - ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles

  - molecule dependency



script:

  - pre-commit run --all-files

  - molecule test --driver docker

  - molecule test --driver $driver --platform $platform



notifications:

  webhooks: https://galaxy.ansible.com/api/v1/notifications/

ansible.cfg

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
library = library

host_key_checking = False

retry_files_enabled = False

roles_path = .molecule/roles:.molecule/../roles:../:../../

roles_path = ../:.molecule/roles:.molecule/../roles:../../

command_warnings = True

deprecation_warnings = True

callback_whitelist = profile_tasks

molecule.yml

+14 −8
Original line number Diff line number Diff line
@@ -13,24 +13,30 @@ vagrant: 
  providers:

  - name: virtualbox

    type: virtualbox

    options:

        cpus: 1

  platforms:

  - name: openbsd

    box: kaorimatz/openbsd-6.0-amd64

  - name: jessie

    box: debian/jessie64

    box: fnichol/openbsd-6.0-i386

  - name: xenial

    box: ubuntu/xenial64

    box: ubuntu/xenial32

  - name: jessie

    box: nogajun/jessie32

  - name: trusty

    box: ubuntu/trusty64

    box: ubuntu/trusty32

  instances:

  - name: gitreceive

    options:

        append_platform_to_hostname: yes

  raw_config_args:

  - 'vm.synced_folder ".", "/vagrant", disabled: true'

  - 'vbguest.auto_update = false'

  - 'landrush.enabled = false'

  - 'landrush_ip.override = false'

  - 'vbguest.auto_update = false if Vagrant.has_plugin?("vbguest")'

  - 'landrush.enabled = false if Vagrant.has_plugin?("landrush")'

  - 'landrush_ip.override = false if Vagrant.has_plugin?("landrush")'

  - |

      vm.provider "virtualbox" do |v|

        v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", "off"]

      end



docker:

  containers:

tests/playbook.yml

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

- hosts: gitreceive-openbsd

  gather_facts: false

  roles: [adarnimrod.openbsd-bootstrap]

  roles: [openbsd-bootstrap]



- hosts: gitreceive-xenial

  gather_facts: false

  roles: [adarnimrod.debian-bootstrap]

  roles: [debian-bootstrap]



- hosts: all

  tasks:
@@ -29,7 +29,6 @@ 
            state: started



- hosts: all

  strategy: free

  roles:

      - role: gitreceive

        gitreceive_public_keys: ['{{ lookup("file", "id_rsa.pub") }}']

tests/requirements.txt

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

testinfra==1.4.5

molecule==1.16.1

ansible-lint==3.4.7

testinfra==1.5.1

molecule==1.17.3

ansible-lint==3.4.9

pre-commit==0.9.4

piprot==0.9.7

python-vagrant==0.5.14

docker-py==1.10.6

netaddr==0.7.18

passlib==1.7.0

bcrypt==3.1.2