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>

4 files changed, 10 insertions, 46 deletions

diff --git a/prototypes/xci/flavors/xci-aio.sh b/prototypes/xci/flavors/aio
index 9f9ea1be6..48754e507 100644
--- a/prototypes/xci/flavors/xci-aio.sh
+++ b/prototypes/xci/flavors/aio
@@ -1,8 +1,6 @@
 #-------------------------------------------------------------------------------
 # XCI Flavor Configuration
 #-------------------------------------------------------------------------------
-# This is the configuration for xci-aio.
-#
 # You are free to modify parts of the configuration to fit into your environment.
 # But before doing that, please ensure you checked other flavors to see if one
 # them can be used instead, saving you some time.
@@ -12,16 +10,9 @@
 # Configure VM Nodes
 #-------------------------------------------------------------------------------
 export TEST_VM_NUM_NODES=1
-export TEST_VM_NODE_NAMES=xciaio
+export TEST_VM_NODE_NAMES=xci
 export VM_DOMAIN_TYPE=kvm
 export VM_CPU=8
 export VM_DISK=80
-export VM_MEMORY_SIZE=12288
+export VM_MEMORY_SIZE=8192
 export VM_DISK_CACHE=unsafe
-
-#-------------------------------------------------------------------------------
-# Ansible Files for the Flavor
-#-------------------------------------------------------------------------------
-XCI_ANSIBLE_PLAYBOOK=$OPNFV_RELENG_PATH/prototypes/xci/file/configure-xci-aio.yml
-XCI_ANSIBLE_INVENTORY=$OPNFV_RELENG_PATH/prototypes/xci/file/xci-aio-inventory
-XCI_ANSIBLE_VARS=$OPNFV_RELENG_PATH/prototypes/xci/file/xci-aio-vars.yml
diff --git a/prototypes/xci/flavors/xci-ha.sh b/prototypes/xci/flavors/ha
index 442432fea..8a045a3dd 100644
--- a/prototypes/xci/flavors/xci-ha.sh
+++ b/prototypes/xci/flavors/ha
@@ -1,8 +1,6 @@
 #-------------------------------------------------------------------------------
 # XCI Flavor Configuration
 #-------------------------------------------------------------------------------
-# This is the configuration for xci-aio.
-#
 # You are free to modify parts of the configuration to fit into your environment.
 # But before doing that, please ensure you checked other flavors to see if one
 # them can be used instead, saving you some time.
@@ -12,16 +10,9 @@
 # Configure VM Nodes
 #-------------------------------------------------------------------------------
 export TEST_VM_NUM_NODES=6
-export TEST_VM_NODE_NAMES="xcimaster controller00 controller01 controller02 compute00 compute01"
+export TEST_VM_NODE_NAMES="xci controller00 controller01 controller02 compute00 compute01"
 export VM_DOMAIN_TYPE=kvm
 export VM_CPU=8
-export VM_DISK=100
+export VM_DISK=80
 export VM_MEMORY_SIZE=16384
 export VM_DISK_CACHE=unsafe
-
-#-------------------------------------------------------------------------------
-# Ansible Files for the Flavor
-#-------------------------------------------------------------------------------
-XCI_ANSIBLE_PLAYBOOK=$OPNFV_RELENG_PATH/prototypes/xci/file/configure-xci-ha.yml
-XCI_ANSIBLE_INVENTORY=$OPNFV_RELENG_PATH/prototypes/xci/file/xci-ha-inventory
-XCI_ANSIBLE_VARS=$OPNFV_RELENG_PATH/prototypes/xci/file/xci-ha-vars.yml
diff --git a/prototypes/xci/flavors/xci-mini.sh b/prototypes/xci/flavors/mini
index 11048f6be..44b015d9f 100644
--- a/prototypes/xci/flavors/xci-mini.sh
+++ b/prototypes/xci/flavors/mini
@@ -1,8 +1,6 @@
 #-------------------------------------------------------------------------------
 # XCI Flavor Configuration
 #-------------------------------------------------------------------------------
-# This is the configuration for xci-aio.
-#
 # You are free to modify parts of the configuration to fit into your environment.
 # But before doing that, please ensure you checked other flavors to see if one
 # them can be used instead, saving you some time.
@@ -12,16 +10,9 @@
 # Configure VM Nodes
 #-------------------------------------------------------------------------------
 export TEST_VM_NUM_NODES=3
-export TEST_VM_NODE_NAMES="xcimaster controller00 compute00"
+export TEST_VM_NODE_NAMES="xci controller00 compute00"
 export VM_DOMAIN_TYPE=kvm
 export VM_CPU=8
-export VM_DISK=100
-export VM_MEMORY_SIZE=12288
+export VM_DISK=80
+export VM_MEMORY_SIZE=8192
 export VM_DISK_CACHE=unsafe
-
-#-------------------------------------------------------------------------------
-# Ansible Files for the Flavor
-#-------------------------------------------------------------------------------
-XCI_ANSIBLE_PLAYBOOK=$OPNFV_RELENG_PATH/prototypes/xci/file/configure-xci-mini.yml
-XCI_ANSIBLE_INVENTORY=$OPNFV_RELENG_PATH/prototypes/xci/file/xci-mini-inventory
-XCI_ANSIBLE_VARS=$OPNFV_RELENG_PATH/prototypes/xci/file/xci-mini-vars.yml
diff --git a/prototypes/xci/flavors/xci-noha.sh b/prototypes/xci/flavors/noha
index 6a83f9962..7f686e5e5 100644
--- a/prototypes/xci/flavors/xci-noha.sh
+++ b/prototypes/xci/flavors/noha
@@ -1,8 +1,6 @@
 #-------------------------------------------------------------------------------
 # XCI Flavor Configuration
 #-------------------------------------------------------------------------------
-# This is the configuration for xci-aio.
-#
 # You are free to modify parts of the configuration to fit into your environment.
 # But before doing that, please ensure you checked other flavors to see if one
 # them can be used instead, saving you some time.
@@ -12,16 +10,9 @@
 # Configure VM Nodes
 #-------------------------------------------------------------------------------
 export TEST_VM_NUM_NODES=4
-export TEST_VM_NODE_NAMES="xcimaster controller00 compute00 compute01"
+export TEST_VM_NODE_NAMES="xci controller00 compute00 compute01"
 export VM_DOMAIN_TYPE=kvm
 export VM_CPU=8
-export VM_DISK=100
-export VM_MEMORY_SIZE=12288
+export VM_DISK=80
+export VM_MEMORY_SIZE=8192
 export VM_DISK_CACHE=unsafe
-
-#-------------------------------------------------------------------------------
-# Ansible Files for the Flavor
-#-------------------------------------------------------------------------------
-XCI_ANSIBLE_PLAYBOOK=$OPNFV_RELENG_PATH/prototypes/xci/file/configure-xci-mini.yml
-XCI_ANSIBLE_INVENTORY=$OPNFV_RELENG_PATH/prototypes/xci/file/xci-mini-inventory
-XCI_ANSIBLE_VARS=$OPNFV_RELENG_PATH/prototypes/xci/file/xci-mini-vars.yml