From 9c776d55e9f69de416823acff52017e9ea6ca5a8 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Thu, 18 Aug 2016 13:13:54 -0400 Subject: correcting the virtual baremetal defaults Defaults for virtual deployments was not correct, there were three baremetal nodes being created by default for a noha deployment. JIRA: APEX-221 Change-Id: I8b13ffb620d8ebaed4308725edbc7e84279872dd Signed-off-by: Dan Radez --- lib/virtual-setup-functions.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lib/virtual-setup-functions.sh') diff --git a/lib/virtual-setup-functions.sh b/lib/virtual-setup-functions.sh index abff25e4..903e3bcd 100755 --- a/lib/virtual-setup-functions.sh +++ b/lib/virtual-setup-functions.sh @@ -30,19 +30,19 @@ EOF # next create the virtual machines and add their definitions to the file if [ "$ha_enabled" == "False" ]; then - # 1 controller + computes - # zero based so just pass compute count - vm_index=$VM_COMPUTES + controller_index=0 else + controller_index=2 # 3 controller + computes # zero based so add 2 to compute count - vm_index=$((2+$VM_COMPUTES)) + if [ $VM_COMPUTES -lt 2 ]; then + VM_COMPUTES=2 + fi fi - for i in $(seq 0 $vm_index); do - if [ "$VM_COMPUTES" -gt 0 ]; then + for i in $(seq 0 $(($controller_index+$VM_COMPUTES))); do + if [ $i -gt $controller_index ]; then capability="profile:compute" - VM_COMPUTES=$((VM_COMPUTES - 1)) else capability="profile:control" if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "$ramsize" -lt 10240 ]]; then -- cgit 1.2.3-korg