X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=scripts%2Fsrc%2Fkubeedge_setup.sh;h=6cfc2c388c37303ba5c0db6051a052e80ba4f84b;hb=refs%2Fchanges%2F64%2F864%2F1;hp=b79416fffb108033a282f87c59a68db2d10112cc;hpb=bb0efb7438d8f1d2b439757e0008cf97b90a6f95;p=eliot.git

diff --git a/scripts/src/kubeedge_setup.sh b/scripts/src/kubeedge_setup.sh
index b79416f..6cfc2c3 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
-
+   #kubectl apply -f https://docs.projectcalico.org/v3.3/getting-started/kubernetes/installation/hosted/rbac-kdd.yaml
+   #kubectl apply -f https://docs.projectcalico.org/v3.3/getting-started/kubernetes/installation/hosted/rbac-kdd.yaml
 }
 
-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 &&\
+source config_kubeedge
+common_steps="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 && \
 chmod +x kubeedge"
 
 certif_copy="cd /etc/kubeedge &&\
 scp certs.tar.gz"
 
-edge_start="kubeedge join --edgecontrollerip=${nodeip} --edgenodeid=eliot_edge_01"
+edge_start="cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm && \
+chmod +x kubeedge && \
+./kubeedge join --edgecontrollerip=$masternodeip --edgenodeid=eliotedge02 --k8sserverip=$masternodeip:8080"
 
 execute_keedge_controller(){
    cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm
@@ -33,30 +39,38 @@ execute_keedge_controller(){
 }
 
 
-# start
+exec_edge(){
 
-take_keedge
+   cd $HOME/eliot/scripts/src
+   sshpass -p ${edgenodepassword} scp $HOME/release/eliot/scripts/src/config_kubeedge ${edgenodeusr}@${edgenodeip}:/root
 
-execute_keedge_controller
+   sshpass -p ${edgenodepassword} ssh ${edgenodeusr}@${edgenodeip} \
+   source config_kubeedge
+   
+   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
 
-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)
+   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 ${nodepaswd} ssh ${nodeusr}@${nodeip} ${common_steps} < /dev/null
-    sshpass -p ${nodepaswd} scp /etc/kubeedge/certs.tar.gz ${nodeusr}@${nodepaswd}:/etc/kubeedge
+# start
 
-    sshpass -p ${nodepaswd} \
-    tar -xvzf /etc/kubeedge/certs.tgz
+source config_kubeedge
+#sample
+#return
+take_keedge
 
-    sshpass -p ${nodepaswd} ssh ${nodeusr}@${nodeip} kubeedge join --edgecontrollerip=${masternodeip} --edgenodeid=eliot_edge_01 \
-    --k8sserverip=${masternodeip}:8080
-done < nodelist
+execute_keedge_controller
 
+#sample
+#execute_edge
+exec_edge
 kubectl get nodes
 
 kubectl create -f deployment.yaml