Commit b477b686 authored Dec 12, 2016 by nimrod

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

# Conflicts:
#	tests/playbook.yml

parents 73383896 46ba6ecd

ansible.cfg

+1 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ retry_files_enabled = False
		roles_path = .molecule/roles:.molecule/../roles:../:../../
		command_warnings = True
		deprecation_warnings = True
		callback_whitelist = profile_tasks

		[ssh_connection]
		pipelining = True

tests/playbook.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@
		state: started

		- hosts: all
		strategy: free
		roles:
		- role: gitreceive
		gitreceive_public_keys: ['{{ lookup("file", "id_rsa.pub") }}']

tests/requirements.txt

+3 −3

Original line number	Diff line number	Diff line
		ansible==2.2.0.0
		testinfra==1.4.4
		molecule==1.15.0
		testinfra==1.4.5
		molecule==1.16.1
		ansible-lint==3.4.7
		pre-commit==0.9.3
		pre-commit==0.9.4
		piprot==0.9.7
		python-vagrant==0.5.14
		docker-py==1.10.6