From 272820005530af9db4d06510b812f7ad60c17bd0 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Wed, 6 Dec 2017 10:26:53 +0000 Subject: xci: Use local playbooks for XCI deployments Previously, we used to clone the releng-xci repository under a directory in /tmp, copy our changes to that repository and then run the xci-deploy.sh script from it. However, this made things far too complex for deployers and developers since some playbooks were used from the local repo whereas others were used from teh /tmp checkout. By running everything from our local repository simplifies things a lot since we can directly test our changes and also reduces the code we have in our playbooks. Change-Id: If16aa51b2846c170676df82d25cb90e26b1568b2 Signed-off-by: Markos Chandras --- xci/var/opnfv.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'xci/var/opnfv.yml') diff --git a/xci/var/opnfv.yml b/xci/var/opnfv.yml index 9eefe6c1..f13a94e8 100644 --- a/xci/var/opnfv.yml +++ b/xci/var/opnfv.yml @@ -8,8 +8,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## OPNFV_RELENG_GIT_URL: "{{ lookup('env','OPNFV_RELENG_GIT_URL') }}" -OPNFV_RELENG_PATH: "{{ lookup('env','OPNFV_RELENG_PATH') }}" -XCI_DEVEL_ROOT: "{{ lookup('env','XCI_DEVEL_ROOT') }}" OPNFV_RELENG_VERSION: "{{ lookup('env','OPNFV_RELENG_VERSION') }}" OPENSTACK_BIFROST_GIT_URL: "{{ lookup('env','OPENSTACK_BIFROST_GIT_URL') }}" OPENSTACK_BIFROST_PATH: "{{ lookup('env','OPENSTACK_BIFROST_PATH') }}" @@ -18,15 +16,15 @@ OPENSTACK_BIFROST_VERSION: "{{ lookup('env','OPENSTACK_BIFROST_VERSION') }}" OPENSTACK_OSA_GIT_URL: "{{ lookup('env','OPENSTACK_OSA_GIT_URL') }}" OPENSTACK_OSA_OPENRC_GIT_URL: "{{ lookup('env', 'OPENSTACK_OSA_OPENRC_GIT_URL') }}" OPENSTACK_OSA_PATH: "{{ lookup('env','OPENSTACK_OSA_PATH') }}" -OPENSTACK_OSA_OPENRC_PATH: "{{ lookup('env', 'OPENSTACK_OSA_OPENRC_PATH') }}" OPENSTACK_OSA_DEV_PATH: "{{ lookup('env','OPENSTACK_OSA_DEV_PATH') }}" OPENSTACK_OSA_VERSION: "{{ lookup('env','OPENSTACK_OSA_VERSION') }}" OPENSTACK_OSA_ETC_PATH: "{{ lookup('env','OPENSTACK_OSA_ETC_PATH') }}" XCI_ANSIBLE_PIP_VERSION: "{{ lookup('env','XCI_ANSIBLE_PIP_VERSION') }}" +XCI_CACHE: "{{ lookup('env', 'XCI_CACHE') }}" 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_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') }}" -- cgit 1.2.3-korg