Merge "Fix version of box used in Vagrantfile"

[icn.git] / deploy / kud / kud_bm_launch.sh

diff --git a/deploy/kud/kud_bm_launch.sh b/deploy/kud/kud_bm_launch.sh
index 2e5f9aa..7fa0c25 100755 (executable)
--- 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
@@ -13,7 +15,8 @@ function get_kud_repo {
     mkdir -p $DOWNLOAD_PATH
     pushd $DOWNLOAD_PATH
     if [ "$1" == "v1" ] ; then
-        git clone --branch v1.0-icn https://github.com/akraino-icn/multicloud-k8s.git
+        export KUD_ADDONS=multus
+        git clone https://github.com/onap/multicloud-k8s.git
     else
         git clone https://github.com/onap/multicloud-k8s.git
     fi
@@ -107,12 +110,11 @@ function kud_install {
 
 function kud_reset {
     pushd $DOWNLOAD_PATH/multicloud-k8s/kud/hosting_providers/vagrant/
-    ansible-playbook -i inventory/hosts.ini /opt/kubespray-2.10.4/reset.yml \
+    ansible-playbook -i inventory/hosts.ini /opt/kubespray-${KUBESPRAY_VERSION}/reset.yml \
         --become --become-user=root -e reset_confirmation=yes
     popd
 }
 
-
 function verifier {
     APISERVER=$(kubectl config view --minify -o \
                     jsonpath='{.clusters[0].cluster.server}')