X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fkud%2Fkud_bm_launch.sh;h=3b40ffc611e3a1daff684cf7495b2b0abf76f704;hb=6f238a5ab869ab419a1e6a1d3ea807230f2edf5b;hp=562142e3aca9f96d8ee6ca684e3bbb97a80065c7;hpb=999c2adc3d38570cac79e63a396e8f4340492961;p=icn.git

diff --git a/deploy/kud/kud_bm_launch.sh b/deploy/kud/kud_bm_launch.sh
index 562142e..3b40ffc 100755
--- a/deploy/kud/kud_bm_launch.sh
+++ b/deploy/kud/kud_bm_launch.sh
@@ -1,19 +1,15 @@
-#!/bin/bash
-set +x
+#!/usr/bin/env bash
+set -eu -o pipefail
 
 LIBDIR="$(dirname "$(dirname "$PWD")")"
 
 source $LIBDIR/env/lib/common.sh
 
-function get_kud_repo {
-    if [ -d $DOWNLOAD_PATH/multicloud-k8s ]; then
-        rm -rf $DOWNLOAD_PATH/multicloud-k8s
-    fi
+export KUBESPRAY_VERSION=2.16.0
 
-    mkdir -p $DOWNLOAD_PATH
-    pushd $DOWNLOAD_PATH
-    git clone https://github.com/onap/multicloud-k8s.git
-    popd
+function get_kud_repo {
+    clone_kud_repository
+    export KUD_ADDONS=multus
 }
 
 function set_ssh_key {
@@ -30,33 +26,19 @@ function set_ssh_key {
 }
 
 function set_bm_kud {
-    pushd $DOWNLOAD_PATH/multicloud-k8s/kud/hosting_providers/vagrant/inventory
+    pushd ${KUDPATH}/kud/hosting_providers/vagrant/inventory
     HOST_IP=${HOST_IP:-$(hostname -I | cut -d ' ' -f 1)}
-    if [ "$1" == "virtlet" ] ; then
-    cat <<EOL > hosts.ini
-[all]
-$HOSTNAME ansible_ssh_host=${HOST_IP} ansible_ssh_port=22
-
-[kube-master]
-$HOSTNAME
-
-[kube-node]
-$HOSTNAME
-
-[etcd]
-$HOSTNAME
-
-[virtlet]
-$HOSTNAME
-
-[k8s-cluster:children]
-kube-node
-kube-master
-EOL
-    else
+    DOCKER_OPTIONS=""
+    if [[ ! -z "${DOCKER_REGISTRY_MIRRORS+x}" ]]; then
+	OPTIONS=""
+	for mirror in ${DOCKER_REGISTRY_MIRRORS}; do
+	    OPTIONS="${OPTIONS} --registry-mirror=${mirror}"
+	done
+	DOCKER_OPTIONS="docker_options=\"${OPTIONS# }\""
+    fi
     cat <<EOL > hosts.ini
 [all]
-$HOSTNAME ansible_ssh_host=${HOST_IP} ansible_ssh_port=22
+$HOSTNAME ansible_ssh_host=${HOST_IP} ansible_ssh_port=22 ${DOCKER_OPTIONS}
 
 [kube-master]
 $HOSTNAME
@@ -71,13 +53,19 @@ $HOSTNAME
 kube-node
 kube-master
 EOL
-    fi
     popd
 }
 
 function kud_install {
-    pushd $DOWNLOAD_PATH/multicloud-k8s/kud/hosting_providers/vagrant/
-    ./installer.sh | tee kud_minial_deploy.log
+    pushd ${KUDPATH}/kud/hosting_providers/vagrant/
+    ./installer.sh | tee kud_deploy.log
+    popd
+}
+
+function kud_reset {
+    pushd ${KUDPATH}/kud/hosting_providers/vagrant/
+    ansible-playbook -i inventory/hosts.ini /opt/kubespray-${KUBESPRAY_VERSION}/reset.yml \
+        --become --become-user=root -e reset_confirmation=yes
     popd
 }
 
@@ -91,9 +79,14 @@ function verifier {
   call_api $APISERVER/api --header "Authorization: Bearer $TOKEN" --insecure
 }
 
+if [ "$1" == "reset" ] ; then
+    kud_reset
+    exit 0
+fi
+
 get_kud_repo
 set_ssh_key
-set_bm_kud $1
+set_bm_kud
 kud_install
 verifier