summaryrefslogtreecommitdiffstats
path: root/xci/playbooks
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-11-30 17:13:03 +0000
committerMarkos Chandras <mchandras@suse.de>2017-12-01 09:28:00 +0000
commit1cfd0c6cdfd5919d269c651e1db455a16361b475 (patch)
treec1fb7bff1b4a142a898590271f844040b5543633 /xci/playbooks
parentde6d6ae606929edf65a26864adc257fee648d27e (diff)
xci: Allow variable overrides from external scenarios
All scenarios are being cloned to XCI_SCENARIOS_CACHE so look there for the various override files. This will allow external scenarios to influence the XCI environment. Change-Id: I39a48ce55baaa29d09737ce6232867ef1165f099 Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/playbooks')
-rw-r--r--xci/playbooks/get-opnfv-scenario-requirements.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/xci/playbooks/get-opnfv-scenario-requirements.yml b/xci/playbooks/get-opnfv-scenario-requirements.yml
index 23aa1d41..1973531b 100644
--- a/xci/playbooks/get-opnfv-scenario-requirements.yml
+++ b/xci/playbooks/get-opnfv-scenario-requirements.yml
@@ -18,6 +18,8 @@
hosts: localhost
connection: local
gather_facts: true
+ vars_files:
+ - ../var/opnfv.yml
tasks:
- name: Remove target directory
file:
@@ -55,7 +57,7 @@
ansible_python_interpreter: "/usr/bin/python"
scenarios: "{{ lookup('file', scenario_file) | from_yaml }}"
scenario_file: '../opnfv-scenario-requirements.yml'
- scenario_path_default: "{{ lookup('env', 'XCI_PATH') }}/.cache/repos/scenarios"
+ scenario_path_default: "{{ XCI_SCENARIOS_CACHE }}"
role_path_default: "{{ playbook_dir }}/roles"
git_clone_retries: 2
git_clone_retry_delay: 5