summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-05-16 14:58:52 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-16 14:58:52 +0000
commitf2bbbd939b4209e9f24f1ebd9d90116fd441b065 (patch)
tree81df4c6693f7639a28d864853f7d13fb35e20f31
parentd54e906bc7b46f051332153e8ec37e8c3f435548 (diff)
parent5ef62747c290944deabf801ccf9c8a2d0f7ec38a (diff)
Merge "prototypes: xci: user-vars: Move root directory away from /opt"
-rwxr-xr-xprototypes/xci/config/user-vars9
1 files changed, 5 insertions, 4 deletions
diff --git a/prototypes/xci/config/user-vars b/prototypes/xci/config/user-vars
index d910405a7..135db71c6 100755
--- a/prototypes/xci/config/user-vars
+++ b/prototypes/xci/config/user-vars
@@ -28,9 +28,10 @@ export XCI_FLAVOR=${XCI_FLAVOR:-aio}
# OPNFV XCI Sandbox is not verified to be used as non-root user as of yet so
# changing these paths might break things.
#-------------------------------------------------------------------------------
-export OPNFV_RELENG_PATH=/opt/releng
-export OPENSTACK_BIFROST_PATH=/opt/bifrost
-export OPENSTACK_OSA_PATH=/opt/openstack-ansible
+export XCI_DEVEL_ROOT=${XCI_DEVEL_ROOT:-"/tmp/.xci-deploy-env"}
+export OPNFV_RELENG_PATH="${XCI_DEVEL_ROOT}/releng"
+export OPENSTACK_BIFROST_PATH="${XCI_DEVEL_ROOT}/bifrost"
+export OPENSTACK_OSA_PATH="${XCI_DEVEL_ROOT}/openstack-ansible"
#-------------------------------------------------------------------------------
# Set the playbook to use for OpenStack deployment
@@ -50,5 +51,5 @@ export OPNFV_OSA_PLAYBOOK=${OPNFV_OSA_PLAYBOOK:-"$OPENSTACK_OSA_PATH/playbooks/s
# or
# ANSIBLE_VERBOSITY="-vvvv"
export ANSIBLE_VERBOSITY=${ANSIBLE_VERBOSITY-""}
-export LOG_PATH=${LOG_PATH:-/opt/opnfv/logs}
+export LOG_PATH=${LOG_PATH:-${XCI_DEVEL_ROOT}/opnfv/logs}
export RUN_TEMPEST=${RUN_TEMPEST:-false}