X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fkud%2Fkud_bm_launch.sh;h=82785fa6413ef331e73b3656eda5f01c0f3465ce;hb=f38f6b220b0843f403e1476b292759b9d84910ca;hp=201665936f726b7d9b4eee46b085208d6be2e511;hpb=ab49400d4b8fa2466758462f33a723941fcdc79e;p=icn.git diff --git a/deploy/kud/kud_bm_launch.sh b/deploy/kud/kud_bm_launch.sh index 2016659..82785fa 100755 --- 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")")" @@ -13,7 +13,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 @@ -37,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 < hosts.ini + cat < hosts.ini [all] $HOSTNAME ansible_ssh_host=${HOST_IP} ansible_ssh_port=22 @@ -55,7 +56,7 @@ kube-node kube-master EOL else - cat < hosts.ini + cat < hosts.ini [all] $HOSTNAME ansible_ssh_host=${HOST_IP} ansible_ssh_port=22 @@ -96,7 +97,7 @@ function kud_install { ./installer.sh | tee kud_deploy.log if [ "$1" == "bm" ]; then - for addon in ${KUD_ADDONS:-multus ovn4nfv nfd sriov qat cmk}; do + for addon in ${KUD_ADDONS:-multus ovn4nfv nfd sriov qat cmk optane}; do pushd $DOWNLOAD_PATH/multicloud-k8s/kud/tests/ bash ${addon}.sh popd