Merge "Remove double quotes around EOF"

diff --combined functions.sh
index 01b558c,d3d027e..c8493d2
--- 1/functions.sh
--- 2/functions.sh
+++ b/functions.sh
@@@ -23,16 -23,7 +23,16 @@@ clean_up() 
  # Create jumphost VM
  create_jump() {
      ./create_vm.sh "$VM_NAME"
 -    sleep 30
 +    jumpbox_ip=$(get_vm_ip)
 +    i=0
 +    while [ -z $jumpbox_ip ]; do
 +        sleep $((++i))
 +        jumpbox_ip=$(get_vm_ip)
 +    done
 +    i=0
 +    until nc -w5 -z $jumpbox_ip 22; do
 +        sleep $((++i))
 +    done
  }
  
  # Get jumphost VM IP
@@@ -42,7 -33,8 +42,8 @@@ get_vm_ip() 
  
  # Setup PXE network
  setup_PXE_network() {
-     ssh -o StrictHostKeyChecking=no -tT "$USERNAME"@"$(get_vm_ip)" << "EOF"
+     # shellcheck disable=SC2087
+     ssh -o StrictHostKeyChecking=no -tT "$USERNAME"@"$(get_vm_ip)" << EOF
  sudo ifconfig $PXE_IF up
  sudo ifconfig $PXE_IF $PXE_IF_IP netmask $NETMASK
  sudo ifconfig $PXE_IF hw ether $PXE_IF_MAC
@@@ -52,13 -44,14 +53,14 @@@ EO
  # Copy files needed by Infra engine & BMRA in the jumphost VM
  copy_files_jump() {
      scp -r -o StrictHostKeyChecking=no \
-     "$CURRENTPATH/{hw_config/$VENDOR/,sw_config/$INSTALLER/}" \
+     "$CURRENTPATH"/{hw_config/"$VENDOR"/,sw_config/"$INSTALLER"/} \
      "$USERNAME@$(get_vm_ip):$PROJECT_ROOT"
  }
  
  # Host Provisioning
  provision_hosts() {
-     ssh -tT "$USERNAME"@"$(get_vm_ip)" << "EOF"
+     # shellcheck disable=SC2087
+     ssh -tT "$USERNAME"@"$(get_vm_ip)" << EOF
  # Install and run cloud-infra
  if [ ! -d "${PROJECT_ROOT}/engine" ]; then
      ssh-keygen -t rsa -N "" -f ${PROJECT_ROOT}/.ssh/id_rsa
@@@ -78,7 -71,8 +80,8 @@@ EO
  
  # Setup networking on provisioned hosts (Adapt setup_network.sh according to your network setup)
  setup_network() {
-     ssh -tT  "$USERNAME"@"$(get_vm_ip)" << "EOF"
+     # shellcheck disable=SC2087
+     ssh -tT  "$USERNAME"@"$(get_vm_ip)" << EOF
  ssh -o StrictHostKeyChecking=no root@$MASTER_IP \
      'bash -s' <  ${PROJECT_ROOT}/${VENDOR}/setup_network.sh
  ssh -o StrictHostKeyChecking=no root@$WORKER_IP \
@@@ -88,7 -82,8 +91,8 @@@ EO
  
  # k8s Provisioning (currently BMRA)
  provision_k8s() {
-     ssh -tT  "$USERNAME"@"$(get_vm_ip)" << "EOF"
+     # shellcheck disable=SC2087
+     ssh -tT  "$USERNAME"@"$(get_vm_ip)" << EOF
  # Install BMRA
  if [ ! -d "${PROJECT_ROOT}/container-experience-kits" ]; then
      curl -fsSL https://get.docker.com/ | sh