Commit 2d0a0c85 authored Jan 02, 2017 by nimrod

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

# Conflicts:
#	tests/playbook.yml

parents 5e76d7c9 828632ee

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

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

tests/requirements.yml

+2 −0

Original line number	Diff line number	Diff line
		---
		- src: adarnimrod.openbsd-bootstrap
		name: openbsd-bootstrap
		- src: adarnimrod.debian-bootstrap
		name: debian-bootstrap