Merge "Allow KuD installer to specify Kubespray 2.14.1 or 2.16.0"

diff --combined kud/tests/plugin_fw_v2.sh
index f19e0f9,86ef97f..6c8d842
--- 1/kud/tests/plugin_fw_v2.sh
--- 2/kud/tests/plugin_fw_v2.sh
+++ b/kud/tests/plugin_fw_v2.sh
@@@ -56,8 -56,7 +56,7 @@@ while [[ $# -gt 0 ]]; d
  
      case $arg in
          "--external" )
-             service_host=$(kubectl cluster-info | grep "Kubernetes master" | \
-                 awk -F ":" '{print $2}' | awk -F "//" '{print $2}')
+             service_host=$(control_plane_ip)
              shift
              ;;
          * )
@@@ -223,10 -222,6 +222,10 @@@ els
          KUBECONFIG=$file kubectl get providernetwork emco-private-net -o name
          KUBECONFIG=$file kubectl get providernetwork unprotected-private-net -o name
      done
 +    # Give some time for the Pods to show up on the clusters.  kubectl
 +    # wait may return with "error: no matching resources found" if the
 +    # Pods have not started yet.
 +    sleep 30s
      for name in $(cluster_names); do
          print_msg "Wait for all pods to start on cluster $name"
          file=$(cluster_file "$name")