X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fkud%2Fkud_bm_launch.sh;h=b7dc9b8fb44bd3a5f0f9da77d591d9d308316cdf;hb=8fcb874a6e5ec52b4a6ac80cb7f34c7baccd8c17;hp=d4b72fca585ba653c06905125566c1e6b12c43f2;hpb=05c811aa5aeaf4c7e630ff0c46be2240478235a0;p=icn.git

diff --git a/deploy/kud/kud_bm_launch.sh b/deploy/kud/kud_bm_launch.sh
index d4b72fc..b7dc9b8 100755
--- a/deploy/kud/kud_bm_launch.sh
+++ b/deploy/kud/kud_bm_launch.sh
@@ -5,22 +5,13 @@ LIBDIR="$(dirname "$(dirname "$PWD")")"
 
 source $LIBDIR/env/lib/common.sh
 
-export KUBESPRAY_VERSION=2.14.1
+export KUBESPRAY_VERSION=2.16.0
 
 function get_kud_repo {
-    if [ -d $DOWNLOAD_PATH/multicloud-k8s ]; then
-        rm -rf $DOWNLOAD_PATH/multicloud-k8s
-    fi
-
-    mkdir -p $DOWNLOAD_PATH
-    pushd $DOWNLOAD_PATH
+    clone_kud_repository
     if [ "$1" == "v1" ] ; then
         export KUD_ADDONS=multus
-        git clone https://github.com/onap/multicloud-k8s.git
-    else
-        git clone https://github.com/onap/multicloud-k8s.git
     fi
-    popd
 }
 
 function set_ssh_key {
@@ -37,12 +28,20 @@ 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)}
+    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
     if [ "$1" == "minimal" ] ; then
         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
@@ -60,7 +59,7 @@ EOL
     else
         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
@@ -89,7 +88,7 @@ EOL
 }
 
 function kud_install {
-    pushd $DOWNLOAD_PATH/multicloud-k8s/kud/hosting_providers/vagrant/
+    pushd ${KUDPATH}/kud/hosting_providers/vagrant/
     if [ "$1" == "all" ]; then
         sed -i -e 's/testing_enabled=${KUD_ENABLE_TESTS:-false}/testing_enabled=${KUD_ENABLE_TESTS:-true}/g' installer.sh
     fi
@@ -97,7 +96,7 @@ function kud_install {
 
     if [ "$1" == "bm" ]; then
         for addon in ${KUD_ADDONS:-multus ovn4nfv nfd sriov qat cmk optane}; do
-            pushd $DOWNLOAD_PATH/multicloud-k8s/kud/tests/
+            pushd ${KUDPATH}/kud/tests/
                 bash ${addon}.sh
             popd
         done
@@ -106,7 +105,7 @@ function kud_install {
 }
 
 function kud_reset {
-    pushd $DOWNLOAD_PATH/multicloud-k8s/kud/hosting_providers/vagrant/
+    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