From 1cfd0c6cdfd5919d269c651e1db455a16361b475 Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
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 <mchandras@suse.de>
---
 xci/config/user-vars                              | 1 +
 xci/playbooks/get-opnfv-scenario-requirements.yml | 4 +++-
 xci/var/opnfv.yml                                 | 1 +
 xci/xci-deploy.sh                                 | 4 ++--
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/xci/config/user-vars b/xci/config/user-vars
index e9980e34..14c0ca45 100755
--- a/xci/config/user-vars
+++ b/xci/config/user-vars
@@ -35,6 +35,7 @@ export OPENSTACK_OSA_OPENRC_PATH="${XCI_DEVEL_ROOT}/openstack-ansible-openstack_
 export OPENSTACK_BIFROST_PATH="${XCI_DEVEL_ROOT}/bifrost"
 export OPENSTACK_OSA_PATH="${XCI_DEVEL_ROOT}/openstack-ansible"
 export OPNFV_SSH_HOST_KEYS_PATH="${XCI_DEVEL_ROOT}/ssh_host_keys"
+export XCI_SCENARIOS_CACHE="${XCI_PATH}/.cache/repos/scenarios"
 
 #-------------------------------------------------------------------------------
 # Set the playbook to use for OpenStack deployment
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
diff --git a/xci/var/opnfv.yml b/xci/var/opnfv.yml
index 287f8849..9eefe6c1 100644
--- a/xci/var/opnfv.yml
+++ b/xci/var/opnfv.yml
@@ -27,6 +27,7 @@ XCI_FLAVOR: "{{ lookup('env','XCI_FLAVOR') }}"
 XCI_FLAVOR_ANSIBLE_FILE_PATH: "{{ lookup('env','XCI_FLAVOR_ANSIBLE_FILE_PATH') }}"
 XCI_LOOP: "{{ lookup('env','XCI_LOOP') }}"
 XCI_PATH: "{{ lookup('env', 'XCI_PATH') }}/"
+XCI_SCENARIOS_CACHE: "{{ lookup('env', 'XCI_SCENARIOS_CACHE') }}"
 LOG_PATH: "{{ lookup('env','LOG_PATH') }}"
 OPNFV_HOST_IP: "{{ lookup('env','OPNFV_HOST_IP') }}"
 OPNFV_SSH_HOST_KEYS_PATH: "{{ lookup('env', 'OPNFV_SSH_HOST_KEYS_PATH') }}"
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index 3a4616ce..b2288163 100755
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -143,8 +143,8 @@ echo "-------------------------------------------------------------------------"
 #-------------------------------------------------------------------------------
 # Get scenario variables overrides
 #-------------------------------------------------------------------------------
-if [[ -f $XCI_PATH/xci/scenarios/${OPNFV_SCENARIO:-_no_scenario_}/xci_overrides ]]; then
-    source $XCI_PATH/xci/scenarios/$OPNFV_SCENARIO/xci_overrides
+if [[ -f $XCI_SCENARIOS_CACHE/${OPNFV_SCENARIO:-_no_scenario_}/xci_overrides ]]; then
+    source $XCI_SCENARIOS_CACHE/$OPNFV_SCENARIO/xci_overrides
 fi
 
 #-------------------------------------------------------------------------------
-- 
cgit 1.2.3-korg