Commit 577a631c authored Nov 23, 2016 by nimrod

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

# Conflicts:
#	tests/playbook.yml

parents ff7b42ef ce216613

README.rst

+1 −2

Original line number	Diff line number	Diff line
		@@ -6,8 +6,7 @@ Role to bootstrap an OpenBSD instance (allow Ansible to provision the instance).
		Requirements
		------------

		See :code:`meta/main.yml`, :code:`tests/requirements.yml` and assertions at
		the top of :code:`tasks/main.yml`.
		See :code:`meta/main.yml` and assertions at the top of :code:`tasks/main.yml`.

		Role Variables
		--------------

tests/requirements.yml

+2 −2

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