3 files changed, 18 insertions, 32 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars
index a7d8696f..67ce443e 100755
--- a/xci/config/env-vars
+++ b/xci/config/env-vars
@@ -8,10 +8,22 @@ export OPENSTACK_OSA_GIT_URL=https://git.openstack.org/openstack/openstack-ansib
 export OPENSTACK_OSA_OPENRC_GIT_URL=https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
 export OPENSTACK_OSA_ETC_PATH=/etc/openstack_deploy
 export OPNFV_HOST_IP=192.168.122.2
-export OPNFV_XCI_PATH=$OPNFV_RELENG_PATH/xci
-export XCI_FLAVOR_ANSIBLE_FILE_PATH=$OPNFV_XCI_PATH/file/$XCI_FLAVOR
+export XCI_FLAVOR_ANSIBLE_FILE_PATH=$XCI_PATH/xci/file/$XCI_FLAVOR
 export CI_LOOP=${CI_LOOP:-daily}
 export JOB_NAME=${JOB_NAME:-false}
+export XCI_CACHE=${XCI_PATH}/.cache
+export XCI_SCENARIOS_CACHE="${XCI_CACHE}/repos/scenarios"
+export XCI_PLAYBOOKS=${XCI_PATH}/xci/playbooks
+
+#-------------------------------------------------------------------------------
+# Paths where git repositories of XCI Components will be cloned
+#-------------------------------------------------------------------------------
+export OPENSTACK_BIFROST_PATH="${XCI_CACHE}/repos/bifrost"
+export OPENSTACK_OSA_PATH="${XCI_CACHE}/repos/openstack-ansible"
+
+# Logging
+export LOG_PATH=${LOG_PATH:-${XCI_PATH}/xci/logs}
+
 # This currently matches to OSA Ansible version but it doesn't really
 # matter since bifrost and OSA will use the Ansible version they need.
 # Overall, it's better to use what OSA supports so we can use new features.
diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions
index e3bfc8db..608c3cc8 100755
--- a/xci/config/pinned-versions
+++ b/xci/config/pinned-versions
@@ -25,7 +25,7 @@
 #-------------------------------------------------------------------------------
 # use releng-xci from master until the development work with the sandbox is complete
 export OPNFV_RELENG_VERSION="master"
-# HEAD of bifrost "master" as of 20.11.2017
-export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"cc46b9280cb0f65e8903af1b15994021018de27e"}
-# HEAD of osa "master" as of 28.11.2017
-export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"746330cc858ad2c419571e56248f6ee82280a3da"}
+# HEAD of bifrost "master" as of 11.12.2017
+export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"bd7e99bf7a00e4c9ad7d03d752d7251e3caf8509"}
+# HEAD of osa "master" as of 11.12.2017
+export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"7b3aac28a0a87e5966527829f6b0abcbc2303cc7"}
diff --git a/xci/config/user-vars b/xci/config/user-vars
index 14c0ca45..e5cb1fbf 100755
--- a/xci/config/user-vars
+++ b/xci/config/user-vars
@@ -24,28 +24,6 @@ export XCI_FLAVOR=${XCI_FLAVOR:-aio}
 export XCI_CEPH_ENABLED=${XCI_CEPH_ENABLED:-false}
 
 #-------------------------------------------------------------------------------
-# Set Paths to where git repositories of XCI Components will be cloned
-#-------------------------------------------------------------------------------
-# OPNFV XCI Sandbox is not verified to be used as non-root user as of yet so
-# changing these paths might break things.
-#-------------------------------------------------------------------------------
-export XCI_DEVEL_ROOT=${XCI_DEVEL_ROOT:-"/tmp/.xci-deploy-env"}
-export OPNFV_RELENG_PATH="${XCI_DEVEL_ROOT}/releng-xci"
-export OPENSTACK_OSA_OPENRC_PATH="${XCI_DEVEL_ROOT}/openstack-ansible-openstack_openrc"
-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
-#-------------------------------------------------------------------------------
-# The variable can be overriden in order to install additional OpenStack services
-# supported by OpenStack Ansible or exclude certain OpenStack services.
-#-------------------------------------------------------------------------------
-export OPNFV_OSA_PLAYBOOK=${OPNFV_OSA_PLAYBOOK:-"$OPENSTACK_OSA_PATH/playbooks/setup-openstack.yml"}
-
-#-------------------------------------------------------------------------------
 # Configure some other stuff
 #-------------------------------------------------------------------------------
 # Set the verbosity for ansible
@@ -55,10 +33,6 @@ export OPNFV_OSA_PLAYBOOK=${OPNFV_OSA_PLAYBOOK:-"$OPENSTACK_OSA_PATH/playbooks/s
 # or
 #   XCI_ANSIBLE_VERBOSITY="-vvvv"
 export XCI_ANSIBLE_VERBOSITY=${XCI_ANSIBLE_VERBOSITY:-""}
-export LOG_PATH=${LOG_PATH:-${XCI_DEVEL_ROOT}/opnfv/logs}
 export RUN_TEMPEST=${RUN_TEMPEST:-false}
 # Set this to to true to force XCI to re-create the target OS images
 export CLEAN_DIB_IMAGES=${CLEAN_DIB_IMAGES:-false}
-# Set this to a full path pointing to extra config files (containing
-# group_vars/all)
-export XCI_EXTRA_VARS_PATH=${XCI_EXTRA_VARS_PATH:-""}