xci: Enable node provisioning and shuffle/rename stuff

This change enables node provisioning using bifrost based on the chosen
flavor.

Other changes include
- move flavor specific stuff (playbooks, inventory, vars) into their own
folders so it is easier to copy them over.
- rename flavors and get rid of xci from them.
- introduce env-vars to keep variables that are not really user variables.

Please note that this patch contains empty files and so on due to still
trying to find best way to structurei things. Apart from this, there will
probably be lots of duplications here and there which will be taken care
of once things settle.

Change-Id: I04a5d422e5b018439bafea5e68e65255ae38d22b
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

1 files changed, 20 insertions, 20 deletions

diff --git a/prototypes/xci/config/user-vars b/prototypes/xci/config/user-vars
index bb2bfe1d3..f29dda66f 100755
--- a/prototypes/xci/config/user-vars
+++ b/prototypes/xci/config/user-vars
@@ -1,36 +1,36 @@
 #-------------------------------------------------------------------------------
-# 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 OPNFV_RELENG_PATH=/opt/releng
-export OPENSTACK_BIFROST_PATH=/opt/bifrost
-export OPENSTACK_OSA_PATH=/opt/openstack-ansible
-
-#-------------------------------------------------------------------------------
 # Set Deployment Flavor
 #-------------------------------------------------------------------------------
 # OPNFV XCI currently supports 4 different types of flavors:
-#   - all in one (aio) - xci-aio.sh: 1 VM which acts as controller and compute node
-#   - mini opnfv: 3 VMs, 1 xcimaster, 1 controller, and 1 compute nodes
-#   - noha: 4 VMs, 1 xcimaster, 1 controller, and 2 compute nodes
-#   - ha: 6 VMs, 1 xcimaster, 3 controllers, and 2 compute nodes
+#   - 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
 #
 # 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
 # each of these flavors.
 #
 # Examples:
-#   export XCI_FLAVOR="xci-aio"
+#   export XCI_FLAVOR="aio"
 # or
-#   export XCI_FLAVOR="xci-mini"
+#   export XCI_FLAVOR="mini"
 # or
-#   export XCI_FLAVOR="xci-noha"
+#   export XCI_FLAVOR="noha"
 # or
-#   export XCI_FLAVOR="xci-ha"
+#   export XCI_FLAVOR="ha"
 #-------------------------------------------------------------------------------
-export XCI_FLAVOR=${XCI_FLAVOR:-xci-mini}
+export XCI_FLAVOR=${XCI_FLAVOR:-aio}
+
+#-------------------------------------------------------------------------------
+# 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 OPNFV_RELENG_PATH=/opt/releng
+export OPENSTACK_BIFROST_PATH=/opt/bifrost
+export OPENSTACK_OSA_PATH=/opt/openstack-ansible
 
 #-------------------------------------------------------------------------------
 # Configure some other stuff
@@ -41,4 +41,4 @@ export XCI_FLAVOR=${XCI_FLAVOR:-xci-mini}
 #   ANSIBLE_VERBOSITY="-v"
 # or
 #   ANSIBLE_VERBOSITY="-vvvv"
-export ANSIBLE_VERBOSITY=${ANSIBLE_VERBOSITY:-""}
+export ANSIBLE_VERBOSITY=${ANSIBLE_VERBOSITY-""}