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 bpa_op_e2e_virtletvm target and deps
[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
..
d4b72fc
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
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
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
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
@@
-87,12
+90,9
@@
EOL
function kud_install {
pushd $DOWNLOAD_PATH/multicloud-k8s/kud/hosting_providers/vagrant/
function kud_install {
pushd $DOWNLOAD_PATH/multicloud-k8s/kud/hosting_providers/vagrant/
- if [ "$1" == "all"
-o "$1" == "vm"
]; then
+ if [ "$1" == "all" ]; then
sed -i -e 's/testing_enabled=${KUD_ENABLE_TESTS:-false}/testing_enabled=${KUD_ENABLE_TESTS:-true}/g' installer.sh
fi
sed -i -e 's/testing_enabled=${KUD_ENABLE_TESTS:-false}/testing_enabled=${KUD_ENABLE_TESTS:-true}/g' installer.sh
fi
- if [ "$1" == "vm" ]; then
- sed -i -e 's/^kube_pods_subnet.*/kube_pods_subnet: 172.21.64.0\/18/g' inventory/group_vars/k8s-cluster.yml
- fi
./installer.sh | tee kud_deploy.log
if [ "$1" == "bm" ]; then
./installer.sh | tee kud_deploy.log
if [ "$1" == "bm" ]; then
@@
-107,12
+107,11
@@
function kud_install {
function kud_reset {
pushd $DOWNLOAD_PATH/multicloud-k8s/kud/hosting_providers/vagrant/
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
}
--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}')