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/config/user-vars | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'xci/config/user-vars') diff --git a/xci/config/user-vars b/xci/config/user-vars index 33b83930..e5cb1fbf 100755 --- a/xci/config/user-vars +++ b/xci/config/user-vars @@ -23,28 +23,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 #------------------------------------------------------------------------------- @@ -55,7 +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} -- cgit