summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-05-09 15:37:24 +0100
committerTrevor Bramwell <tbramwell@linuxfoundation.org>2017-08-11 12:56:12 -0700
commit95b2b70c7bd208de2c41360f9ca227613cf2b9ac (patch)
treec37f67006931c971941d580de8c691aeac373a91
parent29e06269bb1b9c40e1167845d128a03aacb78ea0 (diff)
prototypes: xci: user-vars: Move root directory away from /opt
Having everything in the /opt implies root privileges. However, xci should work as normal user and as such we use the /tmp directory as the root directory. Change-Id: I985ded289208e1de53ad0ba878afd5bfd745c3fd Signed-off-by: Markos Chandras <mchandras@suse.de>
-rwxr-xr-xxci/config/user-vars9
1 files changed, 5 insertions, 4 deletions
diff --git a/xci/config/user-vars b/xci/config/user-vars
index d910405a..135db71c 100755
--- a/xci/config/user-vars
+++ b/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}