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 <dradez@redhat.com>

1 files changed, 7 insertions, 7 deletions

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