Allow KuD installer to specify Kubespray 2.14.1 or 2.16.00.9.2

The default is 2.14.1 (the existing value).  Setting
KUBESPRAY_VERSION=2.16.0 in the installer environment uses the newer
Kubespray version.

The newer Kubespray version installs Kubernetes 1.20.7.  Kubernetes
1.20.7 comes with following caveats:
- The Virtlet addon is disabled; it does not work with 1.20.7.  This
  requires removing the plugin_fw test as well.
- Kubernetes 1.20.7 removed support for basic auth.

Issue-ID: MULTICLOUD-1251
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: Ic8b9fb1f3effc31da58de5bb3768ed9e509d50de

1 files changed, 1 insertions, 2 deletions

diff --git a/kud/tests/kubevirt.sh b/kud/tests/kubevirt.sh
index fbcf1bf6..529a67a7 100755
--- a/kud/tests/kubevirt.sh
+++ b/kud/tests/kubevirt.sh
@@ -39,7 +39,6 @@ if (($try > $tries)); then
 fi
 
 # Test
-master_ip=$(kubectl cluster-info | grep "Kubernetes master" | awk -F '[:/]' '{print $4}')
 deployment_pod=$(kubectl get pods | grep $kubevirt_vmi_name | awk '{print $1}')
 echo "Pod name: $deployment_pod"
 echo "ssh testuser@$(kubectl get pods $deployment_pod -o jsonpath="{.status.podIP}")"
@@ -50,7 +49,7 @@ interval=60
 for ((try=1;try<=$tries;try++)); do
     echo "try $try/$tries: Wait for $interval seconds to check for ssh access"
     sleep $interval
-    if sshpass -p testuser ssh -o ProxyCommand="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -W %h:%p $master_ip" -o StrictHostKeyChecking=no testuser@$(kubectl get pods $deployment_pod -o jsonpath="{.status.podIP}") -- uptime; then
+    if sshpass -p testuser ssh -o ProxyCommand="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -W %h:%p $(control_plane_ip)" -o StrictHostKeyChecking=no testuser@$(kubectl get pods $deployment_pod -o jsonpath="{.status.podIP}") -- uptime; then
         echo "ssh access check is success"
         break
     fi