Do not use hardcoded kubespray version

[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 dd928de..6a0ec18 100755 (executable)
--- a/deploy/kud/kud_bm_launch.sh
+++ b/deploy/kud/kud_bm_launch.sh
@@ -1,5 +1,5 @@
-#!/bin/bash
-set +x
+#!/usr/bin/env bash
+set -eu -o pipefail
 
 LIBDIR="$(dirname "$(dirname "$PWD")")"
 
@@ -12,7 +12,12 @@ function get_kud_repo {
 
     mkdir -p $DOWNLOAD_PATH
     pushd $DOWNLOAD_PATH
-    git clone https://github.com/onap/multicloud-k8s.git
+    if [ "$1" == "v1" ] ; then
+        export KUD_ADDONS=multus
+        git clone https://github.com/onap/multicloud-k8s.git
+    else
+        git clone https://github.com/onap/multicloud-k8s.git
+    fi
     popd
 }
 
@@ -33,7 +38,7 @@ function set_bm_kud {
     pushd $DOWNLOAD_PATH/multicloud-k8s/kud/hosting_providers/vagrant/inventory
     HOST_IP=${HOST_IP:-$(hostname -I | cut -d ' ' -f 1)}
     if [ "$1" == "minimal" ] ; then
-    cat <<EOL > hosts.ini
+        cat <<EOL > hosts.ini
 [all]
 $HOSTNAME ansible_ssh_host=${HOST_IP} ansible_ssh_port=22
 
@@ -51,7 +56,7 @@ kube-node
 kube-master
 EOL
     else
-    cat <<EOL > hosts.ini
+        cat <<EOL > hosts.ini
 [all]
 $HOSTNAME ansible_ssh_host=${HOST_IP} ansible_ssh_port=22
 
@@ -92,22 +97,24 @@ function kud_install {
     ./installer.sh | tee kud_deploy.log
 
     if [ "$1" == "bm" ]; then
-        pushd $DOWNLOAD_PATH/multicloud-k8s/kud/tests/
-            sleep 15
-            bash sriov.sh
-        popd
+        for addon in ${KUD_ADDONS:-multus ovn4nfv nfd sriov qat cmk optane}; do
+            pushd $DOWNLOAD_PATH/multicloud-k8s/kud/tests/
+                bash ${addon}.sh
+            popd
+        done
     fi
     popd
 }
 
 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 \
+    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 \
         --become --become-user=root -e reset_confirmation=yes
     popd
 }
 
-
 function verifier {
     APISERVER=$(kubectl config view --minify -o \
                     jsonpath='{.clusters[0].cluster.server}')
@@ -123,7 +130,7 @@ if [ "$1" == "reset" ] ; then
     exit 0
 fi
 
-get_kud_repo
+get_kud_repo $2
 set_ssh_key
 set_bm_kud $1
 kud_install $1