X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fkud%2Fkud_bm_launch.sh;h=9ba2d403dada770c26b9a6c92f6371cd7f777898;hb=HEAD;hp=b7dc9b8fb44bd3a5f0f9da77d591d9d308316cdf;hpb=88d3e292a2c12513244dc534726387c6d76145e2;p=icn.git

diff --git a/deploy/kud/kud_bm_launch.sh b/deploy/kud/kud_bm_launch.sh
index b7dc9b8..9ba2d40 100755
--- a/deploy/kud/kud_bm_launch.sh
+++ b/deploy/kud/kud_bm_launch.sh
@@ -1,17 +1,16 @@
 #!/usr/bin/env bash
 set -eu -o pipefail
 
-LIBDIR="$(dirname "$(dirname "$PWD")")"
+SCRIPTDIR="$(readlink -f $(dirname ${BASH_SOURCE[0]}))"
+LIBDIR="$(dirname $(dirname ${SCRIPTDIR}))/env/lib"
 
-source $LIBDIR/env/lib/common.sh
+source $LIBDIR/common.sh
 
 export KUBESPRAY_VERSION=2.16.0
 
 function get_kud_repo {
     clone_kud_repository
-    if [ "$1" == "v1" ] ; then
-        export KUD_ADDONS=multus
-    fi
+    export KUD_ADDONS=multus
 }
 
 function set_ssh_key {
@@ -38,8 +37,7 @@ function set_bm_kud {
 	done
 	DOCKER_OPTIONS="docker_options=\"${OPTIONS# }\""
     fi
-    if [ "$1" == "minimal" ] ; then
-        cat <<EOL > hosts.ini
+    cat <<EOL > hosts.ini
 [all]
 $HOSTNAME ansible_ssh_host=${HOST_IP} ansible_ssh_port=22 ${DOCKER_OPTIONS}
 
@@ -56,55 +54,18 @@ $HOSTNAME
 kube-node
 kube-master
 EOL
-    else
-        cat <<EOL > hosts.ini
-[all]
-$HOSTNAME ansible_ssh_host=${HOST_IP} ansible_ssh_port=22 ${DOCKER_OPTIONS}
-
-[kube-master]
-$HOSTNAME
-
-[kube-node]
-$HOSTNAME
-
-[etcd]
-$HOSTNAME
-
-[ovn-central]
-$HOSTNAME
-
-[ovn-controller]
-$HOSTNAME
-
-[virtlet]
-$HOSTNAME
-
-[k8s-cluster:children]
-kube-node
-kube-master
-EOL
-    fi
     popd
 }
 
 function kud_install {
     pushd ${KUDPATH}/kud/hosting_providers/vagrant/
-    if [ "$1" == "all" ]; then
-        sed -i -e 's/testing_enabled=${KUD_ENABLE_TESTS:-false}/testing_enabled=${KUD_ENABLE_TESTS:-true}/g' installer.sh
-    fi
     ./installer.sh | tee kud_deploy.log
-
-    if [ "$1" == "bm" ]; then
-        for addon in ${KUD_ADDONS:-multus ovn4nfv nfd sriov qat cmk optane}; do
-            pushd ${KUDPATH}/kud/tests/
-                bash ${addon}.sh
-            popd
-        done
-    fi
     popd
 }
 
 function kud_reset {
+    # Pick up the kubespray ANSIBLE_CONFIG from /etc/environment
+    source /etc/environment
     pushd ${KUDPATH}/kud/hosting_providers/vagrant/
     ansible-playbook -i inventory/hosts.ini /opt/kubespray-${KUBESPRAY_VERSION}/reset.yml \
         --become --become-user=root -e reset_confirmation=yes
@@ -126,10 +87,10 @@ if [ "$1" == "reset" ] ; then
     exit 0
 fi
 
-get_kud_repo $2
+get_kud_repo
 set_ssh_key
-set_bm_kud $1
-kud_install $1
+set_bm_kud
+kud_install
 verifier
 
 exit 0