From: Todd Malsbary <todd.malsbary@intel.com>
Date: Wed, 27 Oct 2021 21:23:30 +0000 (-0700)
Subject: kubespray_version is no longer in kud-vars
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=c3ca1c962a355e4e17e5ebd4067716bbea39e6bb;hp=013e13962b30443e0b4dad0d646a29c243fa9cf9;p=icn.git

kubespray_version is no longer in kud-vars

KuD now requires the specifying Kubespray version in the environment.

Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: I793c39b815ff43df365a1e4d5de4cdf2c61a6b93
---

diff --git a/deploy/kud/kud_bm_launch.sh b/deploy/kud/kud_bm_launch.sh
index 6a0ec18..7fa0c25 100755
--- a/deploy/kud/kud_bm_launch.sh
+++ b/deploy/kud/kud_bm_launch.sh
@@ -5,6 +5,8 @@ LIBDIR="$(dirname "$(dirname "$PWD")")"
 
 source $LIBDIR/env/lib/common.sh
 
+export KUBESPRAY_VERSION=2.14.1
+
 function get_kud_repo {
     if [ -d $DOWNLOAD_PATH/multicloud-k8s ]; then
         rm -rf $DOWNLOAD_PATH/multicloud-k8s
@@ -108,9 +110,7 @@ function kud_install {
 
 function kud_reset {
     pushd $DOWNLOAD_PATH/multicloud-k8s/kud/hosting_providers/vagrant/
-    local version=$(grep "kubespray_version" ../../deployment_infra/playbooks/kud-vars.yml |
-        awk -F ': ' '{print $2}')
-    ansible-playbook -i inventory/hosts.ini /opt/kubespray-${version}/reset.yml \
+    ansible-playbook -i inventory/hosts.ini /opt/kubespray-${KUBESPRAY_VERSION}/reset.yml \
         --become --become-user=root -e reset_confirmation=yes
     popd
 }