Reflect the changes to other impacted files as well.
Change-Id: I106f4e47fe5c75d288f4878fe6ec9f8ff39c652e
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
# Configure VM Nodes
#-------------------------------------------------------------------------------
export TEST_VM_NUM_NODES=1
-export TEST_VM_NODE_NAMES=xci
+export TEST_VM_NODE_NAMES=opnfv
export VM_DOMAIN_TYPE=kvm
export VM_CPU=8
export VM_DISK=80
export OPENSTACK_OSA_GIT_URL=https://git.openstack.org/openstack/openstack-ansible
export OPENSTACK_OSA_ETC_PATH=/etc/openstack_deploy
export CLEAN_DIB_IMAGES=false
-export XCI_IP=192.168.122.2
+export OPNFV_HOST_IP=192.168.122.2
export XCI_FLAVOR_ANSIBLE_FILE_PATH=$OPNFV_RELENG_PATH/prototypes/xci/file/$XCI_FLAVOR
export JOB_NAME=${JOB_NAME:-false}
export ANSIBLE_HOST_KEY_CHECKING=False
# Configure VM Nodes
#-------------------------------------------------------------------------------
export TEST_VM_NUM_NODES=6
-export TEST_VM_NODE_NAMES="xci controller00 controller01 controller02 compute00 compute01"
+export TEST_VM_NODE_NAMES="opnfv controller00 controller01 controller02 compute00 compute01"
export VM_DOMAIN_TYPE=kvm
export VM_CPU=8
export VM_DISK=80
# Configure VM Nodes
#-------------------------------------------------------------------------------
export TEST_VM_NUM_NODES=3
-export TEST_VM_NODE_NAMES="xci controller00 compute00"
+export TEST_VM_NODE_NAMES="opnfv controller00 compute00"
export VM_DOMAIN_TYPE=kvm
export VM_CPU=8
export VM_DISK=80
# Configure VM Nodes
#-------------------------------------------------------------------------------
export TEST_VM_NUM_NODES=4
-export TEST_VM_NODE_NAMES="xci controller00 compute00 compute01"
+export TEST_VM_NODE_NAMES="opnfv controller00 compute00 compute01"
export VM_DOMAIN_TYPE=kvm
export VM_CPU=8
export VM_DISK=80
# 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
# 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}
# find where are we
XCI_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-# source pinned versions
-source $XCI_PATH/config/pinned-versions
-
# source user vars
source $XCI_PATH/config/user-vars
+# source pinned versions
+source $XCI_PATH/config/pinned-versions
+
# source flavor configuration
source "$XCI_PATH/flavors/${XCI_FLAVOR}-vars"