Merge "xci: Make OSA playbook to use during installation configurable"

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

diff --git a/prototypes/xci/config/user-vars b/prototypes/xci/config/user-vars
index b326f5c..d910405 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
@@ -32,6 +32,14 @@ export OPNFV_RELENG_PATH=/opt/releng
 export OPENSTACK_BIFROST_PATH=/opt/bifrost
 export OPENSTACK_OSA_PATH=/opt/openstack-ansible
 
+#-------------------------------------------------------------------------------
+# 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
 #-------------------------------------------------------------------------------
@@ -42,5 +50,5 @@ export OPENSTACK_OSA_PATH=/opt/openstack-ansible
 # or
 #   ANSIBLE_VERBOSITY="-vvvv"
 export ANSIBLE_VERBOSITY=${ANSIBLE_VERBOSITY-""}
-export LOG_PATH=${LOG_PATH:-/opt/xci/logs}
+export LOG_PATH=${LOG_PATH:-/opt/opnfv/logs}
 export RUN_TEMPEST=${RUN_TEMPEST:-false}