From 1cfd0c6cdfd5919d269c651e1db455a16361b475 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Thu, 30 Nov 2017 17:13:03 +0000 Subject: 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 --- xci/playbooks/get-opnfv-scenario-requirements.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'xci/playbooks/get-opnfv-scenario-requirements.yml') 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 -- cgit 1.2.3-korg