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

diff --git a/deploy/kud/kud_bm_launch.sh b/deploy/kud/kud_bm_launch.sh
index 963e528..3b40ffc 100755
--- a/deploy/kud/kud_bm_launch.sh
+++ b/deploy/kud/kud_bm_launch.sh
@@ -9,9 +9,7 @@ export KUBESPRAY_VERSION=2.16.0
 
 function get_kud_repo {
     clone_kud_repository
-    if [ "$1" == "v1" ] ; then
-        export KUD_ADDONS=multus
-    fi
+    export KUD_ADDONS=multus
 }
 
 function set_ssh_key {
@@ -30,28 +28,17 @@ function set_ssh_key {
 function set_bm_kud {
     pushd ${KUDPATH}/kud/hosting_providers/vagrant/inventory
     HOST_IP=${HOST_IP:-$(hostname -I | cut -d ' ' -f 1)}
-    if [ "$1" == "minimal" ] ; then
-        cat <<EOL > hosts.ini
-[all]
-$HOSTNAME ansible_ssh_host=${HOST_IP} ansible_ssh_port=22
-
-[kube-master]
-$HOSTNAME
-
-[kube-node]
-$HOSTNAME
-
-[etcd]
-$HOSTNAME
-
-[k8s-cluster:children]
-kube-node
-kube-master
-EOL
-    else
-        cat <<EOL > hosts.ini
+    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
@@ -62,37 +49,16 @@ $HOSTNAME
 [etcd]
 $HOSTNAME
 
-[ovn-central]
-$HOSTNAME
-
-[ovn-controller]
-$HOSTNAME
-
-[virtlet]
-$HOSTNAME
-
 [k8s-cluster:children]
 kube-node
 kube-master
 EOL
-    fi
     popd
 }
 
 function kud_install {
     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
     ./installer.sh | tee kud_deploy.log
-
-    if [ "$1" == "bm" ]; then
-        for addon in ${KUD_ADDONS:-multus ovn4nfv nfd sriov qat cmk optane}; do
-            pushd ${KUDPATH}/kud/tests/
-                bash ${addon}.sh
-            popd
-        done
-    fi
     popd
 }
 
@@ -118,10 +84,10 @@ if [ "$1" == "reset" ] ; then
     exit 0
 fi
 
-get_kud_repo $2
+get_kud_repo
 set_ssh_key
-set_bm_kud $1
-kud_install $1
+set_bm_kud
+kud_install
 verifier
 
 exit 0