X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fkud%2Fkud_bm_launch.sh;h=d9ab84d2fa3d19a1d8b747d0f4ba7cca62eb843b;hb=308b436e60c4f9477641a196fe5a53996fd9bc92;hp=6a0ec1861a604897a882fce32a007a0a910385d4;hpb=cb70a29435e04437b845d8b6205cc504e241e049;p=icn.git

diff --git a/deploy/kud/kud_bm_launch.sh b/deploy/kud/kud_bm_launch.sh
index 6a0ec18..d9ab84d 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.16.0
+
 function get_kud_repo {
     if [ -d $DOWNLOAD_PATH/multicloud-k8s ]; then
         rm -rf $DOWNLOAD_PATH/multicloud-k8s
@@ -88,12 +90,9 @@ EOL
 
 function kud_install {
     pushd $DOWNLOAD_PATH/multicloud-k8s/kud/hosting_providers/vagrant/
-    if [ "$1" == "all" -o "$1" == "vm" ]; then
+    if [ "$1" == "all" ]; then
         sed -i -e 's/testing_enabled=${KUD_ENABLE_TESTS:-false}/testing_enabled=${KUD_ENABLE_TESTS:-true}/g' installer.sh
     fi
-    if [ "$1" == "vm" ]; then
-        sed -i -e 's/^kube_pods_subnet.*/kube_pods_subnet: 172.21.64.0\/18/g' inventory/group_vars/k8s-cluster.yml
-    fi
     ./installer.sh | tee kud_deploy.log
 
     if [ "$1" == "bm" ]; then
@@ -108,9 +107,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
 }