X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=scripts%2Fsrc%2Fkubeedge_setup.sh;h=e75c1be74bff1e7304190426b440c628693dbde7;hb=90328e7ac58a1b1e3314ea588b659de185bb1ddd;hp=663606aec4507108f7f5824404ef7b7a8904aa20;hpb=5d6e9448c5e09cdecb0038ff909a8a07994ad527;p=eliot.git

diff --git a/scripts/src/kubeedge_setup.sh b/scripts/src/kubeedge_setup.sh
index 663606a..e75c1be 100755
--- a/scripts/src/kubeedge_setup.sh
+++ b/scripts/src/kubeedge_setup.sh
@@ -17,6 +17,7 @@ take_keedge(){
 }
 
 source config_kubeedge
+
 common_steps="echo $GOPATH && \
 echo $HOME && \
 echo $(whoami) && \
@@ -27,12 +28,9 @@ sudo chmod -R 777 github.com && \
 cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm && \
 make"
 
-certif_copy="cd /etc/kubeedge &&\
-scp certs.tar.gz"
-
 edge_start="cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm && \
 sudo chmod +x kubeedge && \
-sudo ./kubeedge join --edgecontrollerip=$masternodeip --edgenodeid=eliotedge02 --k8sserverip=$masternodeip:8080"
+sudo ./kubeedge join --edgecontrollerip=$MASTERNODEIP --edgenodeid=$EDGENODEID --k8sserverip=$MASTERNODEIP:8080"
 
 execute_keedge_controller(){
    cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm
@@ -41,42 +39,30 @@ execute_keedge_controller(){
 }
 
 exec_edge(){
-echo $(whoami)
-echo =========
-echo $(pwd)
-echo ========
-echo $GOPATH
-echo ========
-echo $HOME
-
-user_check="jenkins"
-home_path="/home/jenkins"
-   if [ $HOME == $home_path ];then
-      cd $HOME/work/workspace/eliot-deploy-kubeedge-virtual-daily-master/scripts/src
-   else
-      cd $HOME/eliot/scripts/src
-   fi
-
-   if [ $HOME == $home_path ];then
-      sshpass -p ${edgenodepassword} scp $HOME/work/workspace/eliot-deploy-kubeedge-virtual-daily-master/scripts/src/config_kubeedge ${edgenodeusr}@${edgenodeip}:/root
-   else
-      sshpass -p ${edgenodepassword} scp $HOME/eliot/scripts/src/config_kubeedge ${edgenodeusr}@${edgenodeip}:/root
-   fi
-
-   sshpass -p ${edgenodepassword} ssh ${edgenodeusr}@${edgenodeip} \
+
+   cd $PATH_OF_ELIOTFOLDER/scripts/src
+
+   sshpass -p ${EDGENODEPASSWORD} \
+   scp $PATH_OF_ELIOTFOLDER/scripts/src/config_kubeedge \
+   ${EDGENODEUSR}@${EDGENODEIP}:$HOME_EDGENODE
+
+   sshpass -p ${EDGENODEPASSWORD} ssh ${EDGENODEUSR}@${EDGENODEIP} \
    source config_kubeedge
 
    source config_kubeedge
-   sshpass -p ${edgenodepassword} ssh ${edgenodeusr}@${edgenodeip} ${common_steps} < /dev/null
+   sshpass -p ${EDGENODEPASSWORD} \
+   ssh ${EDGENODEUSR}@${EDGENODEIP} ${common_steps} < /dev/null
 
    echo "After cloning the code in ELIOT edge node"
-   sshpass -p ${edgenodepassword} scp /etc/kubeedge/certs.tgz ${edgenodeusr}@${edgenodeip}:/etc/kubeedge
+   sshpass -p ${EDGENODEPASSWORD} \
+   scp /etc/kubeedge/certs.tgz ${EDGENODEUSR}@${EDGENODEIP}:/etc/kubeedge
 
-   sshpass -p ${edgenodepassword} \
-   ssh ${edgenodeusr}@${edgenodeip} \
+   sshpass -p ${EDGENODEPASSWORD} \
+   ssh ${EDGENODEUSR}@${EDGENODEIP} \
    tar -xvzf /etc/kubeedge/certs.tgz --directory /etc/kubeedge
 
-   sshpass -p ${edgenodepassword} ssh ${edgenodeusr}@${edgenodeip} ${edge_start} < /dev/null
+   sshpass -p ${EDGENODEPASSWORD} \
+   ssh ${EDGENODEUSR}@${EDGENODEIP} ${edge_start} < /dev/null
 }
 
 # start
@@ -88,18 +74,10 @@ take_keedge
 execute_keedge_controller
 
 exec_edge
-sudo kubectl get nodes
-
-user_chec="jenkins"
-
-if [ $(whoami) == $user_chec ];then
 
-  chmod +x $HOME/work/workspace/eliot-deploy-kubeedge-virtual-daily-master/scripts/verifyk8s.sh
-  source $HOME/work/workpsace/eliot-deploy-kubeedge-virtual-daily-master/scripts/verifyk8s.sh
-
-else
+sleep 10
+sudo kubectl get nodes
 
-  chmod +x $HOME/eliot/scripts/verifyk8s.sh
-  source $HOME/eliot/scripts/verifyk8s.sh
+chmod +x $PATH_OF_ELIOTFOLDER/scripts/verifyk8s.sh
+source $PATH_OF_ELIOTFOLDER/scripts/verifyk8s.sh
 
-fi