diff options
Diffstat (limited to 'vagrant/ansible')
| -rw-r--r-- | vagrant/ansible/Makefile | 10 | ||||
| -rw-r--r-- | vagrant/ansible/roles/client.test.prep/defaults/main.yml (renamed from vagrant/ansible/roles/client.test.prep/defaults/test_repo.yml) | 0 |
2 files changed, 7 insertions, 3 deletions
diff --git a/vagrant/ansible/Makefile b/vagrant/ansible/Makefile index e3d3454..a0c6c95 100644 --- a/vagrant/ansible/Makefile +++ b/vagrant/ansible/Makefile @@ -1,13 +1,17 @@ INVENTORY := ./vagrant_ansible_inventory +ifdef EXTRA_VARS + ANSIBLE_EXTRA_VARS := -e '${EXTRA_VARS}' +endif + setup.test: - @ansible-playbook -i $(INVENTORY) ./test.local.yml + @ansible-playbook -i $(INVENTORY) ${ANSIBLE_EXTRA_VARS} ./test.local.yml setup.cluster: - @ansible-playbook -i $(INVENTORY) ./setup-cluster.yml + @ansible-playbook -i $(INVENTORY) ${ANSIBLE_EXTRA_VARS} ./setup-cluster.yml setup.clients: - @ansible-playbook -i $(INVENTORY) ./setup-clients.yml + @ansible-playbook -i $(INVENTORY) ${ANSIBLE_EXTRA_VARS} ./setup-clients.yml setup.site: setup.cluster setup.clients diff --git a/vagrant/ansible/roles/client.test.prep/defaults/test_repo.yml b/vagrant/ansible/roles/client.test.prep/defaults/main.yml index 614eb97..614eb97 100644 --- a/vagrant/ansible/roles/client.test.prep/defaults/test_repo.yml +++ b/vagrant/ansible/roles/client.test.prep/defaults/main.yml |