From 229971e1d013f1e07969324d3aec81255c9225de Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Apr 08 2019 22:15:11 +0000 Subject: standard-test-source: Put the variables in defaults This allows them to be overridden easily. https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#variable-precedence-where-should-i-put-a-variable --- diff --git a/roles/standard-test-source/defaults/main.yml b/roles/standard-test-source/defaults/main.yml index ceb88f4..c6a40e3 100644 --- a/roles/standard-test-source/defaults/main.yml +++ b/roles/standard-test-source/defaults/main.yml @@ -1,2 +1,6 @@ --- artifacts: "{{ lookup('env', 'TEST_ARTIFACTS') | default('./artifacts', true) }}" +pkgdir: "{{ playbook_dir }}/.." +srcdir: "{{ playbook_dir }}/source" +flatten: True +fetch_only: False diff --git a/roles/standard-test-source/vars/main.yml b/roles/standard-test-source/vars/main.yml deleted file mode 100644 index 1efdc86..0000000 --- a/roles/standard-test-source/vars/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -pkgdir: "{{ playbook_dir }}/.." -srcdir: "{{ playbook_dir }}/source" -flatten: True -fetch_only: False