Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
...@@ -34,6 +34,6 @@ ...@@ -34,6 +34,6 @@
name: piprot name: piprot
description: Check up-to-date Python requirements description: Check up-to-date Python requirements
language: system language: system
entry: piprot --quiet --outdated tests/requirements.txt entry: piprot --outdated tests/requirements.txt
files: requirements.txt files: requirements.txt
always_run: true always_run: true
--- ---
language: python language: python
python: ["2.7", "3.4"] python: ["2.7", "3.5"]
dist: trusty dist: trusty
sudo: True sudo: True
group: beta group: beta
...@@ -14,7 +14,7 @@ env: ...@@ -14,7 +14,7 @@ env:
matrix: matrix:
fast_finish: True fast_finish: True
allow_failures: allow_failures:
- python: "3.4" - python: "3.5"
- env: *openbsd59 - env: *openbsd59
cache: cache:
- pip - pip
......
...@@ -24,10 +24,12 @@ vagrant: ...@@ -24,10 +24,12 @@ vagrant:
box: ubuntu/xenial32 box: ubuntu/xenial32
- name: trusty - name: trusty
box: ubuntu/trusty32 box: ubuntu/trusty32
- name: precise
box: hashicorp/precise32
- name: jessie - name: jessie
box: debian/jessie32 box: deb/jessie-i386
- name: wheezy - name: wheezy
box: debian/wheezy32 box: bmorg/debian-wheezy-i386
instances: instances:
- name: gitreceive - name: gitreceive
options: options:
...@@ -62,6 +64,12 @@ docker: ...@@ -62,6 +64,12 @@ docker:
environment: environment:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
container: docker container: docker
- name: gitreceive-precise
image: ubuntu
image_version: precise
environment:
DEBIAN_FRONTEND: noninteractive
container: docker
- name: gitreceive-jessie - name: gitreceive-jessie
image: debian image: debian
image_version: jessie image_version: jessie
...@@ -77,7 +85,6 @@ docker: ...@@ -77,7 +85,6 @@ docker:
- name: gitreceive-wheezy - name: gitreceive-wheezy
image: debian image: debian
image_version: wheezy image_version: wheezy
command: /sbin/init
environment: environment:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
container: docker container: docker
--- ---
- hosts: gitreceive-openbsd* - hosts: gitreceive-openbsd*
gather_facts: false 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 gather_facts: false
roles: [debian-bootstrap] roles:
- debian-bootstrap
- role: users
users: []
users_use_sudo: True
users_lock_root_ssh: False
- hosts: all - hosts: all
tasks: tasks:
......
ansible==2.2.0.0 ansible==2.2.1.0
testinfra==1.5.1 testinfra==1.5.2
molecule==1.17.3 molecule==1.19.0
ansible-lint==3.4.9 ansible-lint==3.4.10
pre-commit==0.10.1 pre-commit==0.11.0
piprot==0.9.7 piprot==0.9.7
python-vagrant==0.5.14 python-vagrant==0.5.14
docker-py==1.10.6 docker-py==1.10.6
netaddr==0.7.18 netaddr==0.7.19
passlib==1.7.0 passlib==1.7.0
bcrypt==3.1.2 bcrypt==3.1.2
...@@ -3,3 +3,5 @@ ...@@ -3,3 +3,5 @@
name: openbsd-bootstrap name: openbsd-bootstrap
- src: adarnimrod.debian-bootstrap - src: adarnimrod.debian-bootstrap
name: debian-bootstrap name: debian-bootstrap
- src: adarnimrod.users
name: users
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment