Merge "[fuel] Disable all master jobs except nofeature"

[releng.git] / prototypes / xci / config / user-vars

diff --git a/prototypes/xci/config/user-vars b/prototypes/xci/config/user-vars
index 5f3df9a..5ed5396 100755 (executable)
--- a/prototypes/xci/config/user-vars
+++ b/prototypes/xci/config/user-vars
@@ -2,10 +2,10 @@
 # Set Deployment Flavor
 #-------------------------------------------------------------------------------
 # OPNFV XCI currently supports 4 different types of flavors:
-#   - all in one (aio): 1 xci VM which acts as controller and compute node
-#   - mini: 3 VMs, 1 xci VM, 1 controller, and 1 compute nodes
-#   - noha: 4 VMs, 1 xci VM, 1 controller, and 2 compute nodes
-#   - ha: 6 VMs, 1 xci VM, 3 controllers, and 2 compute nodes
+#   - all in one (aio): 1 opnfv VM which acts as controller and compute node
+#   - mini: 3 VMs, 1 opnfv VM deployment host, 1 controller, and 1 compute nodes
+#   - noha: 4 VMs, 1 opnfv VM deployment host, 1 controller, and 2 compute nodes
+#   - ha: 6 VMs, 1 opnfv VM deployment host, 3 controllers, and 2 compute nodes
 #
 # Apart from having different number of nodes, CPU, RAM, and disk allocations
 # also differ from each other. Please take a look at the env-vars files for
@@ -28,9 +28,11 @@ 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"
+export OPNFV_SSH_HOST_KEYS_PATH="${XCI_DEVEL_ROOT}/ssh_host_keys"
 
 #-------------------------------------------------------------------------------
 # Set the playbook to use for OpenStack deployment
@@ -50,5 +52,7 @@ 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/xci/logs}
+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}