Code Review
/
icn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove unused environment variables
[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
8318180
..
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")")"
LIBDIR="$(dirname "$(dirname "$PWD")")"
@@
-13,7
+13,8
@@
function get_kud_repo {
mkdir -p $DOWNLOAD_PATH
pushd $DOWNLOAD_PATH
if [ "$1" == "v1" ] ; then
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
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
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
[all]
$HOSTNAME ansible_ssh_host=${HOST_IP} ansible_ssh_port=22
@@
-55,7
+56,7
@@
kube-node
kube-master
EOL
else
kube-master
EOL
else
- cat <<EOL > hosts.ini
+
cat <<EOL > hosts.ini
[all]
$HOSTNAME ansible_ssh_host=${HOST_IP} ansible_ssh_port=22
[all]
$HOSTNAME ansible_ssh_host=${HOST_IP} ansible_ssh_port=22
@@
-96,22
+97,24
@@
function kud_install {
./installer.sh | tee kud_deploy.log
if [ "$1" == "bm" ]; then
./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/
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
}
--become --become-user=root -e reset_confirmation=yes
popd
}
-
function verifier {
APISERVER=$(kubectl config view --minify -o \
jsonpath='{.clusters[0].cluster.server}')
function verifier {
APISERVER=$(kubectl config view --minify -o \
jsonpath='{.clusters[0].cluster.server}')