Merge ""Better" pattern matching for name of jump VM"

[kuberef.git] / functions.sh

diff --git a/functions.sh b/functions.sh
index 5c37843..7d867cd 100755 (executable)
--- a/functions.sh
+++ b/functions.sh
@@ -10,10 +10,10 @@
 
 # Clean up
 clean_up() {
-    if sudo virsh list --all | grep "${VM_NAME}.*running" ; then
+    if sudo virsh list --all | grep " ${VM_NAME} .*running" ; then
         sudo virsh destroy "$VM_NAME"
     fi
-    if sudo virsh list --all | grep "${VM_NAME}" ; then
+    if sudo virsh list --all | grep " ${VM_NAME} " ; then
         sudo virsh undefine "$VM_NAME"
     fi
     sudo rm -rf "/var/lib/libvirt/images/$VM_NAME"
@@ -105,7 +105,7 @@ copy_files_jump() {
 # Host Provisioning
 provision_hosts() {
     # shellcheck disable=SC2087
-    ssh -tT "$USERNAME"@"$(get_vm_ip)" << EOF
+    ssh -o StrictHostKeyChecking=no -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
@@ -128,7 +128,7 @@ setup_network() {
     WORKER_IP=$(yq r "$CURRENTPATH"/hw_config/"$VENDOR"/pdf.yaml nodes.[1].interfaces.["$PXE_IF_INDEX"].address)
 # SSH to jumphost
     # shellcheck disable=SC2087
-    ssh -tT  "$USERNAME"@"$(get_vm_ip)" << EOF
+    ssh -o StrictHostKeyChecking=no -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 \
@@ -139,7 +139,7 @@ EOF
 # k8s Provisioning (currently BMRA)
 provision_k8s() {
     # shellcheck disable=SC2087
-    ssh -tT  "$USERNAME"@"$(get_vm_ip)" << EOF
+    ssh -o StrictHostKeyChecking=no -tT "$USERNAME"@"$(get_vm_ip)" << EOF
 # Install BMRA
 if [ ! -d "${PROJECT_ROOT}/container-experience-kits" ]; then
     curl -fsSL https://get.docker.com/ | sh