X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=scripts%2Fsrc%2Fkubeedge_setup.sh;h=cc9c6381b22d07f81a0acfdc75dad0f9f560a422;hb=bed7330915b646c4eb6d82d93c1ca4b22936adbc;hp=9c0b4ef35ddd1ce2755152cd81a63b66293be269;hpb=0cc4abf8ca0d6b36673e51b5296508947261b94a;p=eliot.git

diff --git a/scripts/src/kubeedge_setup.sh b/scripts/src/kubeedge_setup.sh
index 9c0b4ef..cc9c638 100755
--- a/scripts/src/kubeedge_setup.sh
+++ b/scripts/src/kubeedge_setup.sh
@@ -16,20 +16,21 @@ take_keedge(){
    make
 }
 
-source config_kubeedge
-common_steps="sudo git clone https://github.com/kubeedge/kubeedge.git $GOPATH/src/github.com/kubeedge/kubeedge && \
+source config_kubeedge > /dev/null 2>&1
+
+common_steps="echo $GOPATH && \
+echo $HOME && \
+echo $(whoami) && \
+sudo git clone https://github.com/kubeedge/kubeedge.git $GOPATH/src/github.com/kubeedge/kubeedge && \
 source ~/.profile && \
 cd $GOPATH/src && \
 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
@@ -39,34 +40,44 @@ execute_keedge_controller(){
 
 exec_edge(){
 
-   cd $HOME/eliot/scripts/src
-   sshpass -p ${edgenodepassword} scp $HOME/release/eliot/scripts/src/config_kubeedge ${edgenodeusr}@${edgenodeip}:/root
+   cd $PATH_OF_ELIOTFOLDER/scripts/src
 
-   sshpass -p ${edgenodepassword} ssh ${edgenodeusr}@${edgenodeip} \
-   source config_kubeedge
+   sshpass -p ${EDGENODEPASSWORD} \
+   scp $PATH_OF_ELIOTFOLDER/scripts/src/config_kubeedge \
+   ${EDGENODEUSR}@${EDGENODEIP}:$HOME_EDGENODE
 
+   sshpass -p ${EDGENODEPASSWORD} ssh ${EDGENODEUSR}@${EDGENODEIP} \
    source config_kubeedge
-   sshpass -p ${edgenodepassword} ssh ${edgenodeusr}@${edgenodeip} ${common_steps} < /dev/null
-echo "after common_steps"
-   sshpass -p ${edgenodepassword} scp /etc/kubeedge/certs.tgz ${edgenodeusr}@${edgenodeip}:/etc/kubeedge
 
-   sshpass -p ${edgenodepassword} \
-   ssh ${edgenodeusr}@${edgenodeip} \
+   source config_kubeedge > /dev/null 2>&1
+   sshpass -p ${EDGENODEPASSWORD} \
+   ssh ${EDGENODEUSR}@${EDGENODEIP} ${common_steps}
+
+   echo "After cloning the code in ELIOT edge node"
+   sshpass -p ${EDGENODEPASSWORD} \
+   scp /etc/kubeedge/certs.tgz ${EDGENODEUSR}@${EDGENODEIP}:/etc/kubeedge
+
+   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}
 }
 
 # start
 
-source config_kubeedge
+source config_kubeedge > /dev/null 2>&1
 
 take_keedge
 
 execute_keedge_controller
 
-exec_edge
+exec_edge > /dev/null 2>&1
+
+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
+