X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=src%2Ffoundation%2Fscripts%2Fstartup.sh;h=01783bcd02815c31d0b45f42d9d953fa515b2492;hb=e70f1cbe15e44cc01e3114cd69481e9b33ce351f;hp=f68c2fb4329e1bd1d1b01bd35cd0841ceeecc533;hpb=83f75f426b1aeffb9d835845921b1b8740cdc80c;p=iec.git

diff --git a/src/foundation/scripts/startup.sh b/src/foundation/scripts/startup.sh
index f68c2fb..01783bc 100755
--- a/src/foundation/scripts/startup.sh
+++ b/src/foundation/scripts/startup.sh
@@ -38,8 +38,8 @@ deploy_k8s () {
 
   #Automatic deploy the K8s environments on Master node
   SETUP_MASTER="cd iec/src/foundation/scripts/ && source k8s_master.sh ${K8S_MASTER_IP}"
-  sshpass -p ${K8S_MASTERPW} ssh ${HOST_USER}@${K8S_MASTER_IP} ${INSTALL_SOFTWARE}
-  sshpass -p ${K8S_MASTERPW} ssh ${HOST_USER}@${K8S_MASTER_IP} ${SETUP_MASTER} | tee ${LOG_FILE}
+  sshpass -p ${K8S_MASTERPW} ssh -o StrictHostKeyChecking=no ${HOST_USER}@${K8S_MASTER_IP} ${INSTALL_SOFTWARE}
+  sshpass -p ${K8S_MASTERPW} ssh -o StrictHostKeyChecking=no ${HOST_USER}@${K8S_MASTER_IP} ${SETUP_MASTER} | tee ${LOG_FILE}
 
   KUBEADM_JOIN_CMD=$(grep "kubeadm join " ./${LOG_FILE})
 
@@ -53,9 +53,11 @@ deploy_k8s () {
     passwd="$(cut -d',' -f2 <<<${worker})"
     echo "Install & Deploy on ${ip_addr}. password:${passwd}"
 
-    sshpass -p ${passwd} ssh ${HOST_USER}@${ip_addr} ${INSTALL_SOFTWARE}
-    sshpass -p ${passwd} ssh ${HOST_USER}@${ip_addr} "echo \"sudo ${KUBEADM_JOIN_CMD}\" >> ./iec/src/foundation/scripts/k8s_worker.sh"
-    sshpass -p ${passwd} ssh ${HOST_USER}@${ip_addr} ${SETUP_WORKER}
+    sshpass -p ${passwd} ssh -o StrictHostKeyChecking=no ${HOST_USER}@${ip_addr} ${INSTALL_SOFTWARE}
+    sshpass -p ${passwd} ssh -o StrictHostKeyChecking=no ${HOST_USER}@${ip_addr} "echo \"sudo ${KUBEADM_JOIN_CMD}\" >> ./iec/src/foundation/scripts/k8s_worker.sh"
+    sleep 2
+    sshpass -p ${passwd} ssh -o StrictHostKeyChecking=no ${HOST_USER}@${ip_addr} "swapon -a"
+    sshpass -p ${passwd} ssh -o StrictHostKeyChecking=no ${HOST_USER}@${ip_addr} ${SETUP_WORKER}
 
   done
 
@@ -63,7 +65,10 @@ deploy_k8s () {
   #Deploy etcd & CNI from master node
   #There may be more options in future. e.g: Calico, Contiv-vpp, Ovn-k8s ...
   SETUP_CNI="cd iec/src/foundation/scripts && source setup-cni.sh"
-  sshpass -p ${K8S_MASTERPW} ssh ${HOST_USER}@${K8S_MASTER_IP} ${SETUP_CNI}
+  sshpass -p ${K8S_MASTERPW} ssh -o StrictHostKeyChecking=no ${HOST_USER}@${K8S_MASTER_IP} ${SETUP_CNI}
+  SETUP_HELM="cd iec/src/foundation/scripts && source helm.sh"
+  sshpass -p ${K8S_MASTERPW} ssh -o StrictHostKeyChecking=no ${HOST_USER}@${K8S_MASTER_IP} ${SETUP_HELM}
+
 }
 
 #
@@ -73,22 +78,22 @@ check_k8s_status(){
   set -o xtrace
 
   VERIFY_K8S="cd iec/src/foundation/scripts/ && source nginx.sh"
-  sshpass -p ${K8S_MASTERPW} ssh ${HOST_USER}@${K8S_MASTER_IP} ${VERIFY_K8S}
-
-  sleep 30
+  sshpass -p ${K8S_MASTERPW} ssh -o StrictHostKeyChecking=no ${HOST_USER}@${K8S_MASTER_IP} ${VERIFY_K8S}
 }
 
 
 #
 # Init
 #
-if [ $1 == "--help" ] || [ $1 == "-h" ];
+if [ -n "$1" ];
 then
-  display_help
-  exit 0
+  if [ $1 == "--help" ] || [ $1 == "-h" ];
+  then
+    display_help
+    exit 0
+  fi
 fi
 
-
 # Read the configuration file
 source config
 
@@ -98,4 +103,6 @@ rm -f "${LOG_FILE}"
 
 deploy_k8s
 
+sleep 20
+
 check_k8s_status