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 stale offline option to scripts
[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
..
6a0ec18
100755
(executable)
--- a/
deploy/kud/kud_bm_launch.sh
+++ b/
deploy/kud/kud_bm_launch.sh
@@
-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
@@
-107,12
+108,13
@@
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 \
+ 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}')