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

diff --git a/scripts/src/kubeedge_setup.sh b/scripts/src/kubeedge_setup.sh
index b79416f..cc9c638 100755
--- a/scripts/src/kubeedge_setup.sh
+++ b/scripts/src/kubeedge_setup.sh
@@ -11,20 +11,26 @@
 take_keedge(){
 
    git clone https://github.com/kubeedge/kubeedge.git $GOPATH/src/github.com/kubeedge/kubeedge
+   source ~/.profile
    cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm
    make
-
 }
 
-common_steps="git clone https://github.com/kubeedge/kubeedge.git $GOPATH/src/github.com/kubeedge/kubeedge &&\
-cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm &&\
-make &&\
-chmod +x kubeedge"
+source config_kubeedge > /dev/null 2>&1
 
-certif_copy="cd /etc/kubeedge &&\
-scp certs.tar.gz"
+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"
 
-edge_start="kubeedge join --edgecontrollerip=${nodeip} --edgenodeid=eliot_edge_01"
+edge_start="cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm && \
+sudo chmod +x kubeedge && \
+sudo ./kubeedge join --edgecontrollerip=$MASTERNODEIP --edgenodeid=$EDGENODEID --k8sserverip=$MASTERNODEIP:8080"
 
 execute_keedge_controller(){
    cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm
@@ -32,33 +38,46 @@ execute_keedge_controller(){
    ./kubeedge init
 }
 
+exec_edge(){
 
-# start
+   cd $PATH_OF_ELIOTFOLDER/scripts/src
 
-take_keedge
+   sshpass -p ${EDGENODEPASSWORD} \
+   scp $PATH_OF_ELIOTFOLDER/scripts/src/config_kubeedge \
+   ${EDGENODEUSR}@${EDGENODEIP}:$HOME_EDGENODE
 
-execute_keedge_controller
+   sshpass -p ${EDGENODEPASSWORD} ssh ${EDGENODEUSR}@${EDGENODEIP} \
+   source config_kubeedge
 
-while read line
-do
-    nodeinfo="${line}"
-    nodeusr=$(echo ${nodeinfo} | cut -d"|" -f1)
-    nodeip=$(echo ${nodeinfo} | cut -d"|" -f2)
-    nodepaswd=$(echo ${nodeinfo} | cut -d"|" -f3)
-    masternodeip=$(echo ${nodeinfo} | cut -d"|" -f3)
+   source config_kubeedge > /dev/null 2>&1
+   sshpass -p ${EDGENODEPASSWORD} \
+   ssh ${EDGENODEUSR}@${EDGENODEIP} ${common_steps}
 
-    sshpass -p ${nodepaswd} ssh ${nodeusr}@${nodeip} ${common_steps} < /dev/null
-    sshpass -p ${nodepaswd} scp /etc/kubeedge/certs.tar.gz ${nodeusr}@${nodepaswd}:/etc/kubeedge
+   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}
+}
 
-    sshpass -p ${nodepaswd} \
-    tar -xvzf /etc/kubeedge/certs.tgz
+# start
+
+source config_kubeedge > /dev/null 2>&1
+
+take_keedge
+
+execute_keedge_controller
 
-    sshpass -p ${nodepaswd} ssh ${nodeusr}@${nodeip} kubeedge join --edgecontrollerip=${masternodeip} --edgenodeid=eliot_edge_01 \
-    --k8sserverip=${masternodeip}:8080
-done < nodelist
+exec_edge > /dev/null 2>&1
 
-kubectl get nodes
+sleep 10
+sudo kubectl get nodes
 
-kubectl create -f deployment.yaml
+chmod +x $PATH_OF_ELIOTFOLDER/scripts/verifyk8s.sh
+source $PATH_OF_ELIOTFOLDER/scripts/verifyk8s.sh
 
-kubectl get pods