Fix VirtualBox nodes removal

Change-Id: Ic764333339e0dc1018c539a675db6f65f7e1d04f

virtualbox/actions/master-node-create-and-install.sh

@@ -26,8 +26,6 @@ source functions/product.sh
 
 # Create master node for the product
 name="${vm_name_prefix}master"
-delete_vm $name
-echo
 create_vm $name "${host_nic_name[0]}" $vm_master_cpu_cores $vm_master_memory_mb $vm_master_disk_mb
 echo
 

virtualbox/actions/slave-nodes-create-and-boot.sh

@@ -26,8 +26,6 @@ source functions/vm.sh
 # Create and start slave nodes
 for idx in $(eval echo {1..$cluster_size}); do
   name="${vm_name_prefix}slave-${idx}"
-  echo
-  delete_vm $name
   vm_ram=${vm_slave_memory_mb[$idx]}
   [ -z $vm_ram ] && vm_ram=$vm_slave_memory_default
   echo

virtualbox/functions/vm.sh

@@ -117,11 +117,12 @@ delete_vm() {
     fi
 
     # Virtualbox does not fully delete VM file structure, so we need to delete the corresponding directory with files as well 
-    if [ -d "$vm_path"  ]; then
-        echo "Deleting existing virtual machine $name..."
-        VBoxManage unregistervm $name --delete
-        rm -rf "$vm_path"
-    fi
+    echo "Deleting existing virtual machine $name..."
+    until VBoxManage unregistervm $name --delete
+    do
+        echo "retrying"
+    done
+    rm -rf "$vm_path"
 }
 
 delete_vms_multiple() {