Commit eb87f2f8 authored by nimrod's avatar nimrod
Browse files

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

# Conflicts:
#	tests/playbook.yml
parents b02050d6 6785200a

.travis.yml

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ cache: 
  - pip

  - directories:

      - $HOME/.pre-commit

      - $HOME/virtualenv



install:

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

ansible.cfg

+2 −1
Original line number Diff line number Diff line
@@ -2,9 +2,10 @@ 
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



[ssh_connection]

pipelining = True

molecule.yml

+1 −2
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ docker: 
    image: debian

    image_version: jessie

    command: /sbin/init

    cap_add:

      - SYS_ADMIN

    privileged: True

    volume_mounts:

      - /sys/fs/cgroup:/sys/fs/cgroup

      - /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket

tests/playbook.yml

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

- hosts: php5-openbsd

  gather_facts: false

  roles: [adarnimrod.openbsd-bootstrap]

  roles: [openbsd-bootstrap]



- hosts: php5-xenial

  gather_facts: false

  roles: [debian-bootstrap]



- hosts: all

  roles: [php5]
 
  strategy: free

  roles:

    - role: php5

tests/requirements.txt

+7 −4
Original line number Diff line number Diff line 
ansible==2.2.0.0

testinfra==1.4.4

molecule==1.15.0

ansible-lint==3.4.4

pre-commit==0.9.3

testinfra==1.4.5

molecule==1.17.0

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